From 63c5ae37c2e5c2993b0e94bd5511489013ba5243 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 24 Apr 2014 11:23:17 +0000
Subject: [PATCH] Backport fix for OPENDJ-1425 dsconfig output is incorrect when configuring LDAPS connection handler in interactive mode
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java | 20 ++++++++++++++------
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java | 11 +++++++----
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
index 997d321..45fd6ad 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -64,6 +64,7 @@
import org.opends.server.admin.Tag;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.admin.UnknownPropertyDefinitionException;
+import org.opends.server.admin.client.ManagedObject;
import org.opends.server.tools.ClientException;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
@@ -430,16 +431,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,
- Collection<PropertyDefinition<?>> c) {
+ 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());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
index 1453f5b..d38558a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -208,8 +208,7 @@
*/
public void display(ConsoleApplication app) {
app.println();
- HelpSubCommandHandler.displaySingleComponent(app, mo
- .getManagedObjectDefinition(), properties);
+ HelpSubCommandHandler.displaySingleComponent(app, mo, properties);
app.println();
app.pressReturnToContinue();
}
@@ -2291,7 +2290,11 @@
// Construct the main menu.
MenuBuilder<Boolean> builder = new MenuBuilder<Boolean>(app);
- Message 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));
Message heading1 = INFO_DSCFG_HEADING_PROPERTY_NAME.get();
--
Gitblit v1.10.0