Fix for OPENDJ-1425 dsconfig output is incorrect when configuring LDAPS con...

Violette Roche-Montane

15.59.2014 ae2936fbee9671c508816da114cb64472317d2c1

Fix for OPENDJ-1425 dsconfig output is incorrect when configuring LDAPS connection handler in interactive mode

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

@@ -61,6 +61,8 @@
import org.forgerock.opendj.config.StringPropertyDefinition;
import org.forgerock.opendj.config.Tag;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.client.ManagedObject;

import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -409,16 +411,23 @@
   *
   * @param app
   *          The application console.
   * @param d
   *          The managed object definition.
   * @param mo
   *          The managed object.
   * @param c
   *          The collection of properties to be displayed.
   */
  public static void displaySingleComponent(ConsoleApplication app,
      AbstractManagedObjectDefinition<?, ?> d,
      ManagedObject<?> mo,
      Collection<PropertyDefinition<?>> c) {
    String ufn = mo.getManagedObjectPath().getName();
    if (ufn == null)
    {
      ufn = mo.getManagedObjectDefinition().getUserFriendlyName().toString();
    }
    // Display the title.
    app.println(INFO_DSCFG_HELP_HEADING_COMPONENT.get(d.getUserFriendlyName()));
    app.println(INFO_DSCFG_HELP_HEADING_COMPONENT.get(ufn));

    final AbstractManagedObjectDefinition<?, ?> d = mo.getManagedObjectDefinition();

    app.println();
    app.println(d.getSynopsis());
@@ -435,7 +444,7 @@
    app.println();

    // Headings.
    TableBuilder builder = new TableBuilder();
    final TableBuilder builder = new TableBuilder();

    builder.appendHeading(INFO_DSCFG_HEADING_PROPERTY_NAME.get());
    builder.appendHeading(INFO_DSCFG_HEADING_PROPERTY_OPTIONS.get());
@@ -445,7 +454,7 @@
    builder.addSortKey(0);

    // Output summary of each property.
    for (PropertyDefinition<?> pd : c) {
    for (final PropertyDefinition<?> pd : c) {
      // Display the property.
      builder.startRow();

@@ -456,13 +465,12 @@
      builder.appendCell(getPropertyOptionSummary(pd));

      // Display the syntax.
      PropertyDefinitionUsageBuilder v = new PropertyDefinitionUsageBuilder(
      final PropertyDefinitionUsageBuilder v = new PropertyDefinitionUsageBuilder(
          false);
      builder.appendCell(v.getUsage(pd));
    }

    TablePrinter printer = new TextTablePrinter(app.getErrorStream());
    builder.print(printer);
    builder.print(new TextTablePrinter(app.getErrorStream()));
  }



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

@@ -201,8 +201,7 @@
    @Override
    public void display(ConsoleApplication app) {
      app.println();
      HelpSubCommandHandler.displaySingleComponent(app, mo
          .getManagedObjectDefinition(), properties);
      HelpSubCommandHandler.displaySingleComponent(app, mo, properties);
      app.println();
      app.pressReturnToContinue();
    }
@@ -2254,7 +2253,11 @@
      // Construct the main menu.
      MenuBuilder<Boolean> builder = new MenuBuilder<Boolean>(app);

      LocalizableMessage ufn = mo.getManagedObjectDefinition().getUserFriendlyName();
      String ufn = mo.getManagedObjectPath().getName();
      if (ufn == null)
      {
        ufn = mo.getManagedObjectDefinition().getUserFriendlyName().toString();
      }
      builder.setPrompt(INFO_EDITOR_HEADING_CONFIGURE_COMPONENT.get(ufn));

      LocalizableMessage heading1 = INFO_DSCFG_HEADING_PROPERTY_NAME.get();