From 9a04549d6ba6786324fbb70e4bc7e3fa8ff987a8 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 02 Nov 2009 09:42:43 +0000
Subject: [PATCH] Undo the changes for issue 4326 (Allow setup of a Server without Data suffix) since some tests are broken with the new behavior. The code has been left in a way that simply changing the default value of the base DN option to null, the command-line setup will allow to configure the server with no base DN.
---
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 5 +++--
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 2 +-
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 9 +++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index e7e932b..491d018 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -470,7 +470,7 @@
INFO_DESCRIPTION_REPLICATION_BASEDNS=Base DN of \
the data to be replicated, initialized or for which we want to disable \
replication. Multiple base DN's can be provided by using this option multiple \
- times. If this option is not provided no base DN will be created
+ times
INFO_DESCRIPTION_REPLICATION_ADMIN_UID=User ID of the \
Global Administrator to use to bind to the server. For the '%s' subcommand \
if no Global Administrator was defined previously for none of the server the \
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index 08fe1c8..5c047c1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -769,6 +769,10 @@
// Check the validity of the base DNs
LinkedList<String> baseDNs = argParser.baseDNArg.getValues();
+ if (baseDNs.isEmpty() && argParser.baseDNArg.getDefaultValue() != null)
+ {
+ baseDNs.add(argParser.baseDNArg.getDefaultValue());
+ }
for (String baseDN : baseDNs)
{
try
@@ -1333,7 +1337,8 @@
throws UserDataException
{
boolean prompt = true;
- if (!argParser.baseDNArg.isPresent())
+ if (!argParser.baseDNArg.isPresent() &&
+ argParser.baseDNArg.getDefaultValue() == null)
{
try
{
@@ -1355,7 +1360,7 @@
else
{
// Check the validity of the base DNs
- LinkedList<String>baseDNs = promptIfRequiredForDNs(
+ LinkedList<String> baseDNs = promptIfRequiredForDNs(
argParser.baseDNArg, INFO_INSTALLDS_PROMPT_BASEDN.get(), true);
dataOptions = promptIfRequiredForDataOptions(baseDNs);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index 694176e..98f4a32 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -204,7 +204,7 @@
OPTION_LONG_BASEDN.toLowerCase(), OPTION_SHORT_BASEDN,
OPTION_LONG_BASEDN, false, true, true,
INFO_BASEDN_PLACEHOLDER.get(),
- null, OPTION_LONG_BASEDN,
+ "dc=example,dc=com", OPTION_LONG_BASEDN,
INFO_INSTALLDS_DESCRIPTION_BASEDN.get());
addArgument(baseDNArg);
@@ -661,7 +661,8 @@
errorMessages.add(message);
}
- if (noPromptArg.isPresent() && !baseDNArg.isPresent())
+ if (noPromptArg.isPresent() && !baseDNArg.isPresent() &&
+ baseDNArg.getDefaultValue() == null)
{
Argument[] args = {importLDIFArg, addBaseEntryArg, sampleDataArg};
for (Argument arg : args)
--
Gitblit v1.10.0