From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 54 +-----------------------------------------------------
1 files changed, 1 insertions(+), 53 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index 14f739d..aaec993 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package org.opends.server.tools;
@@ -44,7 +44,6 @@
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.AdministrationConnector;
-import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.util.SetupUtils;
import org.opends.server.util.args.Argument;
import org.opends.server.util.args.ArgumentException;
@@ -88,8 +87,6 @@
IntegerArgument jmxPortArg;
IntegerArgument sampleDataArg;
StringArgument baseDNArg;
- StringArgument configClassArg;
- StringArgument configFileArg;
StringArgument importLDIFArg;
StringArgument rejectedImportFileArg;
StringArgument skippedImportFileArg;
@@ -138,23 +135,6 @@
cliArg.setPropertyName(OPTION_LONG_CLI);
addArgument(cliArg);
- configFileArg = new StringArgument(
- "configFile".toLowerCase(), 'c', "configFile", false,
- false, true, INFO_CONFIGFILE_PLACEHOLDER.get(), getDefaultConfigFile(),
- "configFile",
- INFO_DESCRIPTION_CONFIG_FILE.get());
- configFileArg.setHidden(true);
- addArgument(configFileArg);
-
- configClassArg = new StringArgument(
- OPTION_LONG_CONFIG_CLASS.toLowerCase(), OPTION_SHORT_CONFIG_CLASS,
- OPTION_LONG_CONFIG_CLASS, false,
- false, true, INFO_CONFIGCLASS_PLACEHOLDER.get(),
- ConfigFileHandler.class.getName(), OPTION_LONG_CONFIG_CLASS,
- INFO_DESCRIPTION_CONFIG_CLASS.get());
- configClassArg.setHidden(true);
- addArgument(configClassArg);
-
String defaultProgName;
if (SetupUtils.isWindows())
{
@@ -461,7 +441,6 @@
if (!isUsageArgumentPresent() && !isVersionArgumentPresent())
{
- checkConfigFileArg(errorMessages);
checkServerPassword(errorMessages);
checkProvidedPorts(errorMessages);
checkImportDataArguments(errorMessages);
@@ -516,23 +495,6 @@
}
/**
- * Checks that we have a config file value (at least the default value).
- * @param errorMessages the list of messages to which we add the error
- * messages describing the problems encountered during the execution of the
- * checking.
- */
- private void checkConfigFileArg(Collection<Message> errorMessages)
- {
- // Make sure the path to the configuration file was given.
- if (configFileArg.getValue() == null)
- {
- Message message = ERR_INSTALLDS_NO_CONFIG_FILE.get(
- configFileArg.getLongIdentifier());
- errorMessages.add(message);
- }
- }
-
- /**
* Checks that there are no conflicts with the directory manager passwords.
* If we are in no prompt mode, check that the password was provided.
* @param errorMessages the list of messages to which we add the error
@@ -785,20 +747,6 @@
}
/**
- * Returns the default config file retrieved by inspecting the class loader.
- * @return the default config file retrieved by inspecting the class loader.
- */
- private String getDefaultConfigFile()
- {
- // Use this instead of Installation.getLocal() because making that call
- // starts a new JVM and the command-line becomes less responsive.
- String a = Utils.getInstallPathFromClasspath();
- String root = Utils.getInstancePathFromInstallPath(a);
- String configDir = Utils.getPath(root, Installation.CONFIG_PATH_RELATIVE);
- return Utils.getPath(configDir, Installation.CURRENT_CONFIG_FILE_NAME);
- }
-
- /**
* Returns the timeout to be used to connect in milliseconds. The method
* must be called after parsing the arguments.
* @return the timeout to be used to connect in milliseconds. Returns
--
Gitblit v1.10.0