Checkpoint commit for OPENDJ-1306 - Removed default CLI value from Listener...

Violette Roche-Montane

07.16.2014 a8b1f24a577acf3d2bd1154974d6bbe86ddf460b

Checkpoint commit for OPENDJ-1306
- Removed default CLI value from ListenerSettings.
- Modified CLI to add default values to ldap port, admin port, etc... and unit tests.

 opendj-server/src/main/java/org/forgerock/opendj/server/setup/cli/SetupCli.java

@@ -29,7 +29,6 @@
import static com.forgerock.opendj.cli.Utils.checkJavaVersion;
import static com.forgerock.opendj.cli.CliMessages.*;


import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -45,6 +44,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.CLIException;
import com.forgerock.opendj.cli.CliConstants;
import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.FileBasedArgument;
@@ -53,6 +53,7 @@
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.SubCommand;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
import com.forgerock.opendj.cli.Utils;

/**
 * This class implements the new CLI for OpenDJ3 setup.
@@ -149,7 +150,8 @@

    /** Create the command-line argument parser for use with this program. */
    int run(final String[] args) {
        // TODO SetupLog.initLogFileHandler();
        // TODO Activate logger when the instance/installation path will be resolved.
        // SetupLog.initLogFileHandler();

        try {
            checkJavaVersion();
@@ -212,9 +214,9 @@
        rejectedImportFile = CommonArguments.getRejectedImportLdif();
        skippedImportFile = CommonArguments.getSkippedImportFile();
        sampleData = CommonArguments.getSampleData();
        ldapPort = CommonArguments.getLDAPPort(389); // TODO
        adminConnectorPort = CommonArguments.getAdminLDAPPort(1444); // TODO
        jmxPort = CommonArguments.getJMXPort(1444); // TODO
        ldapPort = CommonArguments.getLDAPPort(CliConstants.DEFAULT_LDAP_PORT);
        adminConnectorPort = CommonArguments.getAdminLDAPPort(CliConstants.DEFAULT_ADMIN_PORT);
        jmxPort = CommonArguments.getJMXPort(CliConstants.DEFAULT_JMX_PORT);
        skipPortCheck = CommonArguments.getSkipPortCheck();
        directoryManagerDN = CommonArguments.getRootDN();
        directoryManagerPwdString = CommonArguments.getRootDNPwd();
@@ -222,9 +224,9 @@
        enableWindowsService = CommonArguments.getEnableWindowsService();
        doNotStart = CommonArguments.getDoNotStart();
        enableStartTLS = CommonArguments.getEnableTLS();
        ldapsPort = CommonArguments.getLDAPSPort(1636); // TODO
        ldapsPort = CommonArguments.getLDAPSPort(CliConstants.DEFAULT_LDAPS_PORT);
        generateSelfSignedCertificate = CommonArguments.getGenerateSelfSigned();
        hostName = CommonArguments.getHostName("TODO"); // TODO
        hostName = CommonArguments.getHostName(Utils.getDefaultHostName());
        usePkcs11 = CommonArguments.getUsePKCS11Keystore();
        useJavaKeyStore = CommonArguments.getUseJavaKeyStore();
        useJCEKS = CommonArguments.getUseJCEKS();

 opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/ListenerSettings.java

@@ -29,36 +29,13 @@
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import static com.forgerock.opendj.cli.CliConstants.*;

/**
 * This class provides listener settings for the OpenDJ3 setup.
 */
class ListenerSettings {

    /** Default value for incrementing port number. */
    static final int PORT_INCREMENT = 1000;

    /** Default port number for the LDAP port. */
    static final int DEFAULT_LDAP_PORT = 389;

    /** Default port number for the LDAPS port. */
    static final int DEFAULT_LDAPS_PORT = 1636;

    /** Default port number for the administrator port. */
    static final int DEFAULT_ADMIN_PORT = 1444;

    /** Default port number for the SSL Connection. */
    static final int DEFAULT_SSL_PORT = 636;

    /** Default port number for the JMX Connection handler. */
    static final int DEFAULT_JMX_PORT = 1689;

    /** Default port number for the HTTP Connection handler. */
    static final int DEFAULT_HTTP_PORT = 8080;

    /** Default port number for the SNMP Connection handler. */
    static final int DEFAULT_SNMP_PORT = 161;

    /** Default name of root user DN. */
    static final String DEFAULT_ROOT_USER_DN = "cn=Directory Manager";

    private String hostName;
    private int ldapPort;
    private int ldapsPort;

 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java

@@ -28,6 +28,7 @@
import java.net.InetSocketAddress;
import java.net.ServerSocket;

import static com.forgerock.opendj.cli.CliConstants.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -43,16 +44,16 @@
    @Test()
    public void testGetDefault() {
        final ListenerSettings dsSettings = new ListenerSettings();
        assertThat(dsSettings.getAdminPort()).isEqualTo(ListenerSettings.DEFAULT_ADMIN_PORT);
        assertThat(dsSettings.getHTTPPort()).isEqualTo(ListenerSettings.DEFAULT_HTTP_PORT);
        assertThat(dsSettings.getJMXPort()).isEqualTo(ListenerSettings.DEFAULT_JMX_PORT);
        assertThat(dsSettings.getLdapPort()).isEqualTo(ListenerSettings.DEFAULT_LDAP_PORT);
        assertThat(dsSettings.getLdapsPort()).isEqualTo(ListenerSettings.DEFAULT_LDAPS_PORT);
        assertThat(dsSettings.getSNMPPort()).isEqualTo(ListenerSettings.DEFAULT_SNMP_PORT);
        assertThat(dsSettings.getSSLPortNumber()).isEqualTo(ListenerSettings.DEFAULT_SSL_PORT);
        assertThat(dsSettings.getAdminPort()).isEqualTo(DEFAULT_ADMIN_PORT);
        assertThat(dsSettings.getHTTPPort()).isEqualTo(DEFAULT_HTTP_PORT);
        assertThat(dsSettings.getJMXPort()).isEqualTo(DEFAULT_JMX_PORT);
        assertThat(dsSettings.getLdapPort()).isEqualTo(DEFAULT_LDAP_PORT);
        assertThat(dsSettings.getLdapsPort()).isEqualTo(DEFAULT_LDAPS_PORT);
        assertThat(dsSettings.getSNMPPort()).isEqualTo(DEFAULT_SNMP_PORT);
        assertThat(dsSettings.getSSLPortNumber()).isEqualTo(DEFAULT_SSL_PORT);

        assertThat(dsSettings.getHostName()).isEmpty();
        assertThat(dsSettings.getRootUserDN()).isEqualTo(ListenerSettings.DEFAULT_ROOT_USER_DN);
        assertThat(dsSettings.getRootUserDN()).isEqualTo(DEFAULT_ROOT_USER_DN);
        assertThat(dsSettings.getPassword()).isNull();
        assertFalse(dsSettings.isSSLEnabled());
        assertThat(dsSettings.getCertificate()).isNull();
@@ -77,7 +78,7 @@
        // Verify the new port number is different from the free socket and verify it's free.
        final int newPort = ListenerSettings.getFreeSocketPort(port);
        assertThat(newPort).isNotEqualTo(port);
        assertTrue(Math.abs(newPort - port) % ListenerSettings.PORT_INCREMENT == 0);
        assertTrue(Math.abs(newPort - port) % PORT_INCREMENT == 0);

        boundSocket.close();
    }

 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java

@@ -25,6 +25,7 @@
 */
package org.forgerock.opendj.server.setup.model;

import static com.forgerock.opendj.cli.CliConstants.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -66,13 +67,13 @@
        ds.getListenerSettings().setPassword("password");

        // Verify ports
        assertThat(dsSettings.getAdminPort()).isEqualTo(ListenerSettings.DEFAULT_ADMIN_PORT);
        assertThat(dsSettings.getHTTPPort()).isEqualTo(ListenerSettings.DEFAULT_HTTP_PORT);
        assertThat(dsSettings.getJMXPort()).isEqualTo(ListenerSettings.DEFAULT_JMX_PORT);
        assertThat(dsSettings.getLdapPort()).isEqualTo(ListenerSettings.DEFAULT_LDAP_PORT);
        assertThat(dsSettings.getLdapsPort()).isEqualTo(ListenerSettings.DEFAULT_LDAPS_PORT);
        assertThat(dsSettings.getSNMPPort()).isEqualTo(ListenerSettings.DEFAULT_SNMP_PORT);
        assertThat(dsSettings.getSSLPortNumber()).isEqualTo(ListenerSettings.DEFAULT_SSL_PORT);
        assertThat(dsSettings.getAdminPort()).isEqualTo(DEFAULT_ADMIN_PORT);
        assertThat(dsSettings.getHTTPPort()).isEqualTo(DEFAULT_HTTP_PORT);
        assertThat(dsSettings.getJMXPort()).isEqualTo(DEFAULT_JMX_PORT);
        assertThat(dsSettings.getLdapPort()).isEqualTo(DEFAULT_LDAP_PORT);
        assertThat(dsSettings.getLdapsPort()).isEqualTo(DEFAULT_LDAPS_PORT);
        assertThat(dsSettings.getSNMPPort()).isEqualTo(DEFAULT_SNMP_PORT);
        assertThat(dsSettings.getSSLPortNumber()).isEqualTo(DEFAULT_SSL_PORT);

        assertFalse(ds.isService());
        assertTrue(ds.isStartingServerAfterSetup());