Checkpoint for OPENDJ-1303 "opendj-cli" - OPENDJ-1343 Migrate dsconfig - Mo...

Violette Roche-Montane

24.46.2014 39573f165d2e93360dca897d688234f0198e997c

Checkpoint for OPENDJ-1303 "opendj-cli" - OPENDJ-1343 Migrate dsconfig
- Moved messages from admin_tool.properties to cli.properties.
- ReplicationCliMain :
  - Replaced DSConfigMessages / ToolsMessages / UtilityMessages by CliMessages (opendj-cli)

 opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties

@@ -850,4 +850,21 @@
INFO_LDAPAUTH_PASSWORD_PROMPT=Password for user '%s':
INFO_DESCRIPTION_ADMIN_UID=User ID of the Global Administrator \
 to use to bind to the server
 
#
# Connection messages
#
ERR_FAILED_TO_CONNECT=Unable to connect to the server at "%s" on port %s
ERR_SIMPLE_BIND_NOT_SUPPORTED=Unable to authenticate using simple \
authentication
ERR_FAILED_TO_CONNECT_WRONG_PORT=Unable to connect to the \
 server at %s on port %s. Check this port is an administration port
ERR_CANNOT_BIND_TO_PRIVILEGED_PORT=ERROR:  Unable to \
 bind to port %d.  This port may already be in use, or you may not have \
 permission to bind to it.  On UNIX-based operating systems, non-root users \
 may not be allowed to bind to ports 1 through 1024
ERR_CANNOT_BIND_TO_PORT=ERROR:  Unable to bind to port \
 %d.  This port may already be in use, or you may not have permission to bind \
 to it
ERR_FAILED_TO_CONNECT_NOT_TRUSTED=Unable to connect to the \
 server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \
 you must use the '--trustAll' option for remote connections

 opendj-sdk/opendj3-server-dev/src/messages/messages/admin_tool.properties

@@ -547,10 +547,6 @@
 must be created.%nYou must provide the credentials of the Global \
 Administrator that will be created to manage the server instances that are \
 being replicated.
INFO_ADMINISTRATOR_UID_PROMPT=Global Administrator User ID
INFO_ADMINISTRATOR_PWD_PROMPT=Global Administrator Password:
INFO_ADMINISTRATOR_PWD_CONFIRM_PROMPT=Confirm Password:
ERR_ADMINISTRATOR_PWD_DO_NOT_MATCH=The provided passwords do not match.
ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN=Could not connect to the \
 Directory Server %s with the provided credentials.%nError details: %s%n%n\
 Provide again the required information to connect to the server:

 opendj-sdk/opendj3-server-dev/src/messages/messages/dsconfig.properties

@@ -421,8 +421,6 @@
ERR_DSCFG_EQUIVALENT_COMMAND_LINE_FILE_DIRECTORY_156=The specified \
 path %s to write the equivalent command is a directory.  You must specify a \
 path to a file
ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT_157=Unable to connect to the \
 server at %s on port %s. Check this port is an administration port
ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED_158=Unable to connect to the \
 server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \
 you must use the '--trustAll' option for remote connections

 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java

@@ -31,6 +31,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static org.forgerock.util.Utils.closeSilently;

import java.security.GeneralSecurityException;
@@ -225,7 +226,7 @@
            if (e.getCause() instanceof SSLException)
            {
              LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
                  ERR_FAILED_TO_CONNECT_NOT_TRUSTED.get(
                      hostName, portNumber);
              throw new ClientException(ReturnCode.CLIENT_SIDE_CONNECT_ERROR,
                  message);

 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -106,10 +106,6 @@
import com.forgerock.opendj.cli.MenuResult;
import com.forgerock.opendj.cli.ValidationCallback;

import static com.forgerock.opendj.cli.CliMessages.ERR_BAD_INTEGER;
import static com.forgerock.opendj.cli.CliMessages.INFO_ADMINISTRATOR_PWD_PROMPT;
import static com.forgerock.opendj.cli.CliMessages.INFO_ADMINISTRATOR_UID_PROMPT;
import static com.forgerock.opendj.cli.CliMessages.INFO_PROMPT_SINGLE_DEFAULT;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
import static com.forgerock.opendj.cli.Utils.getCurrentOperationDateMessage;
import static com.forgerock.opendj.cli.Utils.getMessageForException;
@@ -137,14 +133,12 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;

import static org.opends.admin.ads.ServerDescriptor.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.DSConfigMessages.ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT;
import static org.opends.messages.DSConfigMessages.ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED;
import static org.opends.messages.DSConfigMessages.ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.UtilityMessages.
    ERR_CONFIRMATION_TRIES_LIMIT_REACHED;
import static org.opends.messages.ToolMessages.INFO_TASK_TOOL_TASK_SUCESSFULL;
import static org.opends.messages.ToolMessages.INFO_TASK_TOOL_TASK_SCHEDULED_FUTURE;
import static org.opends.messages.ToolMessages.INFO_TASK_TOOL_RECURRING_TASK_SCHEDULED;
import static org.opends.quicksetup.util.Utils.getFirstValue;
import static org.opends.quicksetup.util.Utils.getThrowableMsg;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
@@ -1317,7 +1311,7 @@
                  || (e.getCause() instanceof SSLHandshakeException))
              {
                LocalizableMessage message =
                    ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(hostName, portNumber);
                    ERR_FAILED_TO_CONNECT_NOT_TRUSTED.get(hostName, portNumber);
                throw new ClientException(
                    ReturnCode.CLIENT_SIDE_CONNECT_ERROR, message);
              }
@@ -1325,7 +1319,7 @@
            if (e.getCause() instanceof SSLException)
            {
              LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(hostName, portNumber);
                  ERR_FAILED_TO_CONNECT_WRONG_PORT.get(hostName, portNumber);
              throw new ClientException(
                  ReturnCode.CLIENT_SIDE_CONNECT_ERROR, message);
            }
@@ -1384,13 +1378,13 @@
            else
            {
              LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
                  ERR_FAILED_TO_CONNECT.get(hostName, portNumber);
              throw new ClientException(
                  ReturnCode.CLIENT_SIDE_CONNECT_ERROR, message);
            }
          }
          LocalizableMessage message =
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
              ERR_FAILED_TO_CONNECT.get(hostName, portNumber);
          throw new ClientException(ReturnCode.CLIENT_SIDE_CONNECT_ERROR,
              message);
        }
@@ -1412,7 +1406,7 @@
        catch (NamingException e)
        {
          LocalizableMessage message =
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
              ERR_FAILED_TO_CONNECT.get(hostName, portNumber);
          throw new ClientException(ReturnCode.CLIENT_SIDE_CONNECT_ERROR,
              message);
        }
@@ -9340,11 +9334,11 @@
    LocalizableMessage message;
    if (SetupUtils.isPriviledgedPort(port))
    {
      message = ERR_INSTALLDS_CANNOT_BIND_TO_PRIVILEGED_PORT.get(port);
      message = ERR_CANNOT_BIND_TO_PRIVILEGED_PORT.get(port);
    }
    else
    {
      message = ERR_INSTALLDS_CANNOT_BIND_TO_PORT.get(port);
      message = ERR_CANNOT_BIND_TO_PORT.get(port);
    }
    return message;
  }