OPENDJ-1337 Remove all code related to dsframework

Jean-Noel Rouvignac

10.49.2014 9ea7b3f8b3730a5be6c441ed1a6e52b00eb1233f

OPENDJ-1337 Remove all code related to dsframework

 opendj3-server-dev/resource/bin/dsframework

File was deleted

 opendj3-server-dev/resource/bin/dsframework.bat

File was deleted

 opendj3-server-dev/resource/man/man1/dsframework.1

File was deleted

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java

@@ -120,7 +120,7 @@
    String[] names =
    {
        "start-ds", "import-ldif.offline", "backup.online", "base64",
        "create-rc-script", "dsconfig", "dsreplication", "dsframework",
        "create-rc-script", "dsconfig", "dsreplication",
        "export-ldif.online", "import-ldif.online", "ldapcompare",
        "ldapdelete", "ldapmodify", "ldappasswordmodify", "ldapsearch",
        "list-backends", "manage-account", "manage-tasks", "restore.online",

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java

@@ -26,14 +26,23 @@
 */
package org.opends.guitools.uninstaller;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;

import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
import javax.net.ssl.TrustManager;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;

import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;

import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.TopologyCache;
@@ -47,9 +56,9 @@
import org.opends.quicksetup.util.PlainTextProgressMessageFormatter;
import org.opends.quicksetup.util.ServerController;
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.tools.ClientException;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;
@@ -58,20 +67,9 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.CLIException;

import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.Collections;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;

import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
import javax.net.ssl.TrustManager;
import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;

/**
 * The class used to provide some CLI interface in the uninstall.
@@ -157,7 +155,7 @@
       */
      LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
      int v = args.validateGlobalOptions(buf);
      if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode())
      if (v != ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode())
      {
        throw new UserDataException(null, buf.toMessage());
      }

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java

@@ -27,11 +27,6 @@

package org.opends.guitools.uninstaller;

import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.tools.ToolConstants.*;

import java.io.OutputStream;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -41,12 +36,18 @@
import org.opends.quicksetup.UserData;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.admin.client.cli.SecureConnectionCliParser;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;

import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;

import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;

/**
 * Class used to parse and populate the arguments of the Uninstaller.
 *
@@ -249,6 +250,7 @@
   * @return <CODE>true</CODE> if the user specified to have a verbose
   * uninstall and <CODE>false</CODE> otherwise.
   */
  @Override
  public boolean isVerbose()
  {
    return verboseArg.isPresent();
@@ -373,6 +375,7 @@
   * @param buf the LocalizableMessageBuilder to write the error messages.
   * @return return code.
   */
  @Override
  public int validateGlobalOptions(LocalizableMessageBuilder buf)
  {
    int returnValue;
@@ -397,13 +400,13 @@
          removeBackupFilesArg,
          removeLDIFFilesArg
      };
      for (int i=0; i<removeArgs.length; i++)
      for (BooleanArgument removeArg : removeArgs)
      {
        if (removeArgs[i].isPresent())
        if (removeArg.isPresent())
        {
          LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
              removeAllArg.getLongIdentifier(),
              removeArgs[i].getLongIdentifier());
              removeArg.getLongIdentifier());
          if (buf.length() > 0)
          {
            buf.append(EOL);
@@ -415,11 +418,11 @@
    super.validateGlobalOptions(buf);
    if (buf.length() > 0)
    {
      returnValue = CONFLICTING_ARGS.getReturnCode();
      returnValue = ErrorReturnCode.CONFLICTING_ARGS.getReturnCode();
    }
    else
    {
      returnValue = SUCCESSFUL_NOP.getReturnCode();
      returnValue = ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode();
    }
    return returnValue;
  }

 opendj3-server-dev/src/main/docbkx/admin-guide/chap-admin-tools.xml

@@ -20,7 +20,7 @@
  !
  ! CCPL HEADER END
  !
  !      Copyright 2011-2013 ForgeRock AS
  !      Copyright 2011-2014 ForgeRock AS
  !    
-->
<chapter xml:id='chap-admin-tools'
@@ -280,16 +280,6 @@
     command.</para>
    </listitem>
   </varlistentry>
<!--
   <varlistentry>
    <term><link xlink:href="admin-guide#dsframework-1"
    xlink:role="http://docbook.org/xlink/role/olink">dsframework</link></term>
    <listitem>
     <para>Manage server registration, server groups, and administrative
     users.</para>
    </listitem>
   </varlistentry>
-->
   <varlistentry>
    <term><link xlink:href="admin-guide#dsjavaproperties-1"
    xlink:role="http://docbook.org/xlink/role/olink">dsjavaproperties</link></term>

 opendj3-server-dev/src/main/docbkx/admin-guide/index.xml

@@ -110,7 +110,6 @@
   <xinclude:include href='man-create-rc-script.xml' />
   <xinclude:include href='man-dbtest.xml' />
   <xinclude:include href='man-dsconfig.xml' />
   <xinclude:include href='man-dsframework.xml' />
   <xinclude:include href='man-dsjavaproperties.xml' />
   <xinclude:include href='man-dsreplication.xml' />
   <xinclude:include href='man-encode-password.xml' />

 opendj3-server-dev/src/main/docbkx/admin-guide/man-dsframework.xml

File was deleted

 opendj3-server-dev/src/main/docbkx/release-notes/chap-compatibility.xml

@@ -20,7 +20,7 @@
  !
  ! CCPL HEADER END
  !
  !      Copyright 2011-2013 ForgeRock AS
  !      Copyright 2011-2014 ForgeRock AS
  !    
-->
<chapter xml:id='chap-compatibility'
@@ -149,9 +149,6 @@
  Use of the old variables is Deprecated. The old variables are likely to be
  removed in a future release.</para>

  <para>The <command>dsframework</command> command is Deprecated and likely
  to be removed in a future release.</para>

  <itemizedlist>
   <para>The following OpenDJ LDAP SDK methods are Deprecated and likely to be
   removed in a future release.</para>
@@ -167,5 +164,7 @@
  
  <para>Native packages in SVR4 format for Solaris are not provided at this
  time.</para>

  <para>The <command>dsframework</command> command has been removed.</para>
 </section>
</chapter>

 opendj3-server-dev/src/messages/messages/quicksetup.properties

@@ -895,8 +895,7 @@
 and server %s could not be merged.  Reasons:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=The following administrators are defined in \
 server %s but not in server %s:%n%s%nThe merge can only be performed if these \
 administrators are defined in server %s.  Use the command-line dsframework \
 to do so.
 administrators are defined in server %s.
INFO_INITIAL_MEMORY_LABEL=Initial Memory:
INFO_INITIAL_MEMORY_TOOLTIP=Provide the initial memory in megabytes that \
 the Java process will use.

 opendj3-server-dev/src/messages/messages/quicksetup_de.properties

@@ -617,7 +617,7 @@
INFO_ADS_CONTEXT_EXCEPTION_MSG=Fehler bei den Registrierungsinformationen.  Fehlertyp: '%s'.
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Fehler bei den Registrierungsinformationen.  Fehlertyp: '%s'.  Details: %s
FATAL_ERR_ADS_MERGE=Die Registrierungsinformationen von Server %s und Server %s konnten nicht zusammengef\u00fchrt werden.  Ursachen:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Die folgenden Administratoren sind in Server %s aber nicht in Server %s definiert:%n%s%nDie Zusammenf\u00fchrung ist nur m\u00f6glich, wenn diese Administratoren in Server %s definiert sind.  Verwenden Sie hierzu die Befehlszeile dsframework.
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Die folgenden Administratoren sind in Server %s aber nicht in Server %s definiert:%n%s%nDie Zusammenf\u00fchrung ist nur m\u00f6glich, wenn diese Administratoren in Server %s definiert sind.
INFO_INITIAL_MEMORY_LABEL=Anf\u00e4nglicher Arbeitsspeicher:
INFO_INITIAL_MEMORY_TOOLTIP=Geben Sie den anf\u00e4nglichen Speicher, den der Java-Prozess verwendet, in Megabyte an.
INFO_MAX_MEMORY_LABEL=Maximaler Arbeitsspeicher:

 opendj3-server-dev/src/messages/messages/quicksetup_es.properties

@@ -617,7 +617,7 @@
INFO_ADS_CONTEXT_EXCEPTION_MSG=Error de informaci\u00f3n de registro.  Tipo de error: '%s'.
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Error de informaci\u00f3n de registro.  Tipo de error: '%s'.  Detalles: %s
FATAL_ERR_ADS_MERGE=No pudo combinarse la informaci\u00f3n de registro del servidor %s y del servidor %s.  Razones:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Se han definido los siguientes administradores en el servidor %s, pero no en el servidor %s:%n%s%nS\u00f3lo puede realizarse la combinaci\u00f3n si se definen dichos administradores en el servidor %s.  Para ello, use la l\u00ednea se comandos dsframework.
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Se han definido los siguientes administradores en el servidor %s, pero no en el servidor %s:%n%s%nS\u00f3lo puede realizarse la combinaci\u00f3n si se definen dichos administradores en el servidor %s.
INFO_INITIAL_MEMORY_LABEL=Memoria inicial:
INFO_INITIAL_MEMORY_TOOLTIP=Proporcione la memoria inicial en megabytes que emplear\u00e1 el proceso Java.
INFO_MAX_MEMORY_LABEL=Memoria m\u00e1xima:

 opendj3-server-dev/src/messages/messages/quicksetup_fr.properties

@@ -618,7 +618,7 @@
INFO_ADS_CONTEXT_EXCEPTION_MSG=Erreur sur les informations d'enregistrement.  Type d'erreur : '%s'.
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Erreur sur les informations d'enregistrement.  Type d'erreur : '%s'.  D\u00e9tails\u00a0: %s
FATAL_ERR_ADS_MERGE=Impossible de fusionner les informations d'enregistrement des serveurs %s et %s.  Raisons\u00a0:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Les administrateurs suivants sont d\u00e9finis sur le serveur %s mais pas sur le serveur %s\u00a0:%n%s%nLa fusion ne fonctionne que si ces administrateurs sont d\u00e9finis sur le serveur %s. Utilisez la ligne de commande dsframework pour effectuer l'op\u00e9ration.
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=Les administrateurs suivants sont d\u00e9finis sur le serveur %s mais pas sur le serveur %s\u00a0:%n%s%nLa fusion ne fonctionne que si ces administrateurs sont d\u00e9finis sur le serveur %s.
INFO_INITIAL_MEMORY_LABEL=M\u00e9moire initiale\u00a0:
INFO_INITIAL_MEMORY_TOOLTIP=Indiquez la quantit\u00e9 de m\u00e9moire initiale (en m\u00e9ga-octets) que le processus Java va utiliser.
INFO_MAX_MEMORY_LABEL=M\u00e9moire maximale\u00a0:

 opendj3-server-dev/src/messages/messages/quicksetup_ja.properties

@@ -617,7 +617,7 @@
INFO_ADS_CONTEXT_EXCEPTION_MSG=\u767b\u9332\u60c5\u5831\u30a8\u30e9\u30fc\u3002\u30a8\u30e9\u30fc\u306e\u30bf\u30a4\u30d7: '%s'\u3002
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=\u767b\u9332\u60c5\u5831\u30a8\u30e9\u30fc\u3002\u30a8\u30e9\u30fc\u306e\u30bf\u30a4\u30d7: '%s'\u3002\u8a73\u7d30: %s
FATAL_ERR_ADS_MERGE=\u30b5\u30fc\u30d0\u30fc %s \u3068\u30b5\u30fc\u30d0\u30fc %s \u306e\u767b\u9332\u60c5\u5831\u3092\u30de\u30fc\u30b8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7406\u7531:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=\u6b21\u306e\u7ba1\u7406\u8005\u306f\u3001\u30b5\u30fc\u30d0\u30fc %s \u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u30b5\u30fc\u30d0\u30fc %s \u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093:%n%s%n\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001\u3053\u308c\u3089\u306e\u7ba1\u7406\u8005\u3092\u30b5\u30fc\u30d0\u30fc %s \u306b\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u5b9a\u7fa9\u3059\u308b\u306b\u306f\u3001\u30b3\u30de\u30f3\u30c9\u884c dsframework \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=\u6b21\u306e\u7ba1\u7406\u8005\u306f\u3001\u30b5\u30fc\u30d0\u30fc %s \u306b\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u30b5\u30fc\u30d0\u30fc %s \u306b\u306f\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u305b\u3093:%n%s%n\u30de\u30fc\u30b8\u3092\u5b9f\u884c\u3059\u308b\u306b\u306f\u3001\u3053\u308c\u3089\u306e\u7ba1\u7406\u8005\u3092\u30b5\u30fc\u30d0\u30fc %s \u306b\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
INFO_INITIAL_MEMORY_LABEL=\u521d\u671f\u30e1\u30e2\u30ea\u30fc:
INFO_INITIAL_MEMORY_TOOLTIP=Java \u30d7\u30ed\u30bb\u30b9\u304c\u4f7f\u7528\u3059\u308b\u521d\u671f\u30e1\u30e2\u30ea\u30fc\u3092 MB \u5358\u4f4d\u3067\u6307\u5b9a\u3057\u307e\u3059\u3002
INFO_MAX_MEMORY_LABEL=\u6700\u5927\u30e1\u30e2\u30ea\u30fc:

 opendj3-server-dev/src/messages/messages/quicksetup_zh_CN.properties

@@ -617,7 +617,7 @@
INFO_ADS_CONTEXT_EXCEPTION_MSG=\u6ce8\u518c\u4fe1\u606f\u9519\u8bef\u3002\u9519\u8bef\u7c7b\u578b: '%s'\u3002
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=\u6ce8\u518c\u4fe1\u606f\u9519\u8bef\u3002\u9519\u8bef\u7c7b\u578b: '%s'\u3002\u8be6\u7ec6\u4fe1\u606f: %s
FATAL_ERR_ADS_MERGE=\u4e0d\u80fd\u5408\u5e76\u670d\u52a1\u5668 %s \u4e0e\u670d\u52a1\u5668 %s \u7684\u6ce8\u518c\u4fe1\u606f\u3002\u539f\u56e0:%n%s
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=\u4ee5\u4e0b\u7ba1\u7406\u5458\u53ea\u5728\u670d\u52a1\u5668 %s \u4e2d\u5b9a\u4e49\uff0c\u800c\u672a\u5728\u670d\u52a1\u5668 %s:%n%s \u4e2d\u5b9a\u4e49\u3002%n\u53ea\u6709\u5728\u670d\u52a1\u5668 %s \u4e2d\u5b9a\u4e49\u8fd9\u4e9b\u7ba1\u7406\u5458\u65f6\u624d\u80fd\u6267\u884c\u5408\u5e76\u3002\u4f7f\u7528\u547d\u4ee4\u884c dsframework \u5b8c\u6210\u6b64\u64cd\u4f5c\u3002
FATAL_ERR_ADS_ADMINISTRATOR_MERGE=\u4ee5\u4e0b\u7ba1\u7406\u5458\u53ea\u5728\u670d\u52a1\u5668 %s \u4e2d\u5b9a\u4e49\uff0c\u800c\u672a\u5728\u670d\u52a1\u5668 %s:%n%s \u4e2d\u5b9a\u4e49\u3002%n\u53ea\u6709\u5728\u670d\u52a1\u5668 %s \u4e2d\u5b9a\u4e49\u8fd9\u4e9b\u7ba1\u7406\u5458\u65f6\u624d\u80fd\u6267\u884c\u5408\u5e76\u3002
INFO_INITIAL_MEMORY_LABEL=\u521d\u59cb\u5185\u5b58:
INFO_INITIAL_MEMORY_TOOLTIP=\u63d0\u4f9b Java \u8fdb\u7a0b\u4f7f\u7528\u7684\u521d\u59cb\u5185\u5b58\uff08\u4ee5\u5146\u5b57\u8282\u4e3a\u5355\u4f4d\uff09\u3002
INFO_MAX_MEMORY_LABEL=\u6700\u5927\u5185\u5b58:

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions copyright 2011-2013 ForgeRock AS.
 *      Portions copyright 2011-2014 ForgeRock AS.
 */
package org.opends.quicksetup;

@@ -902,7 +902,7 @@
  {
    return new String[] {
      "backup.online", "base64", "create-rc-script", "dsconfig",
      "dsreplication", "dsframework", "export-ldif.online",
      "dsreplication", "export-ldif.online",
      "import-ldif.online", "ldapcompare", "ldapdelete",
      "ldapmodify", "ldappasswordmodify", "ldapsearch", "list-backends",
      "manage-account", "manage-tasks", "restore.online", "stop-ds",

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliMain.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliReturnCode.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServerGroup.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/DsFrameworkCliSubCommandGroup.java

File was deleted

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java

@@ -24,10 +24,9 @@
 *      Copyright 2007-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011-2014 ForgeRock AS
 */

package org.opends.server.admin.client.cli;

import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
import org.forgerock.i18n.LocalizableMessage;

 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java

@@ -27,12 +27,6 @@

package org.opends.server.admin.client.cli;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -41,13 +35,19 @@

import javax.net.ssl.KeyManager;

import org.opends.admin.ads.util.ApplicationTrustManager;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.server.util.PasswordReader;

import com.forgerock.opendj.cli.*;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

/**
 * This is a commodity class that can be used to check the arguments required
 * to establish a secure connection in the command line.  It can be used
@@ -371,7 +371,7 @@
        buf.append(EOL);
      }
      buf.append(message);
      ret = CONFLICTING_ARGS.getReturnCode();
      ret = 1;
    }

    return ret;

 opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java

@@ -27,19 +27,7 @@

package org.opends.server.tools;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.EOL;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.*;
import java.util.Enumeration;
import java.util.Properties;

@@ -48,9 +36,13 @@
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.util.Utils;
import org.opends.server.types.NullOutputStream;
import com.forgerock.opendj.cli.ArgumentException;
import org.opends.server.util.cli.ConsoleApplication;

import com.forgerock.opendj.cli.ArgumentException;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;

/**
 * This class is used to update the scripts that are used to launch the command
 * lines.  We read the contents of a given properties file and we update the
@@ -89,7 +81,11 @@
    /**
     * Error writing to destination file.
     */
    ERROR_WRITING_FILE(3);
    ERROR_WRITING_FILE(3),
    /**
     * Conflicting command line arguments.
     */
    CONFLICTING_ARGS(18);

    private int returnCode;
    private ErrorReturnCode(int returnCode)
@@ -432,6 +428,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isQuiet()
  {
    return argParser.quietArg.isPresent();
@@ -440,6 +437,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isInteractive()
  {
    return false;
@@ -456,6 +454,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isScriptFriendly() {
    return false;
  }
@@ -463,6 +462,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isAdvancedMode() {
    return false;
  }
@@ -471,6 +471,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isVerbose() {
    return true;
  }

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

@@ -26,18 +26,15 @@
 */
package org.opends.server.tools.dsconfig;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.admin.ads.util.OpendsCertificateException;

import static org.opends.messages.DSConfigMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.client.AuthenticationException;
import org.opends.server.admin.client.AuthenticationNotSupportedException;
import org.opends.server.admin.client.CommunicationException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPConnection;
@@ -45,21 +42,26 @@
import org.opends.server.config.ConfigException;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.tools.ClientException;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;
import org.opends.server.util.cli.CommandBuilder;
import org.opends.server.util.cli.ConsoleApplication;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;

import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.SubCommandArgumentParser;
import org.opends.server.util.cli.CommandBuilder;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
import org.opends.server.util.cli.ConsoleApplication;

import java.util.LinkedHashSet;

import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
import javax.net.ssl.KeyManager;
import javax.net.ssl.TrustManager;
import java.util.LinkedHashSet;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
import org.opends.server.tools.ToolConstants;
import javax.net.ssl.TrustManager;

import static org.opends.messages.DSConfigMessages.*;


/**
@@ -96,6 +98,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public ManagementContext getManagementContext(ConsoleApplication app)
      throws ArgumentException, ClientException
  {
@@ -114,6 +117,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void close()
  {
    if (context != null)
@@ -125,6 +129,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public CommandBuilder getContextCommandBuilder()
  {
    return contextCommandBuilder;
@@ -327,6 +332,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void setRawArguments(String[] args) {
    this.rawArgs = args;

@@ -335,6 +341,7 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void registerGlobalArguments(SubCommandArgumentParser parser)
      throws ArgumentException {
    // Create the global arguments.
@@ -376,12 +383,13 @@
  /**
   * {@inheritDoc}
   */
  @Override
  public void validateGlobalArguments() throws ArgumentException {
    // Make sure that the user didn't specify any conflicting
    // arguments.
    LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
    int v = secureArgsList.validateGlobalOptions(buf);
    if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode())
    if (v != ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode())
    {
      throw new ArgumentException(buf.toMessage());
    }

 opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java

@@ -57,7 +57,6 @@
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.admin.AdministrationConnector;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.config.ConfigException;
import org.opends.server.tools.ClientException;
@@ -304,7 +303,7 @@
    }
    int v = argParser.validateGlobalOptions(getErrorStream());

    if (v != DsFrameworkCliReturnCode.SUCCESSFUL_NOP.getReturnCode()) {
    if (v != ErrorReturnCode.SUCCESSFUL_NOP.getReturnCode()) {
      println(LocalizableMessage.raw(argParser.getUsage()));
      return v;
    } else {

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java

File was deleted

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java

File was deleted

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java

@@ -22,28 +22,23 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.tools.dsconfig;



import java.io.File;
import java.io.FileWriter;

import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.core.DirectoryServer;

import static org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode.*;
import static org.testng.Assert.*;

import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;



/**
 * A set of test cases for the dsservice tool.
 */

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java

@@ -30,7 +30,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
import static org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode.*;
import static org.testng.Assert.*;

/**
@@ -110,7 +110,7 @@
    };
    try
    {
      assertEquals(dsconfigMain(args), CANNOT_INITIALIZE_ARGS.getReturnCode());
      assertEquals(dsconfigMain(args), 1);
    }
    finally
    {