From 751f2d572387f3391e11d63259638ddedc922ed1 Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Wed, 13 May 2009 09:33:25 +0000
Subject: [PATCH] Revert of : Partial Fix for issue #3938 : dsconfig is really too slow in non-interactive mode, almost unusable on Niagara systems
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 21 +--------------------
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 6 ++----
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/InternalManagementContextFactory.java | 7 -------
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ManagementContextFactory.java | 8 --------
4 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 6774144..7ae1d56 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -544,8 +544,7 @@
* @throws ArgumentException
* If a global argument could not be registered.
*/
- private void initializeGlobalArguments(String[] args)
- throws ArgumentException {
+ private void initializeGlobalArguments() throws ArgumentException {
if (globalArgumentsInitialized == false) {
verboseArgument = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
@@ -620,7 +619,6 @@
// Register any global arguments required by the management
// context factory.
- factory.setRawArguments(args);
factory.registerGlobalArguments(parser);
globalArgumentsInitialized = true;
@@ -708,7 +706,7 @@
private int run(String[] args) {
// Register global arguments and sub-commands.
try {
- initializeGlobalArguments(args);
+ initializeGlobalArguments();
initializeSubCommands();
} catch (ArgumentException e) {
Message message = ERR_CANNOT_INITIALIZE_ARGS.get(e.getMessage());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/InternalManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/InternalManagementContextFactory.java
index 5a2ba67..7da1cf2 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/InternalManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/InternalManagementContextFactory.java
@@ -105,11 +105,4 @@
return new CommandBuilder(null, null);
}
- /**
- * {@inheritDoc}
- */
- public void setRawArguments(String[] args) {
- // No implementation required.
- }
-
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 228c780..64bed3d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -59,7 +59,6 @@
import java.util.LinkedHashSet;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLHandshakeException;
-import org.opends.server.tools.ToolConstants;
/**
@@ -80,9 +79,6 @@
// This CLI is always using the administration connector with SSL
private boolean alwaysSSL = false;
- // Raw arguments
- private String[] rawArgs = null;
-
/**
* Creates a new LDAP management context factory.
*
@@ -327,13 +323,7 @@
return context;
}
- /**
- * {@inheritDoc}
- */
- public void setRawArguments(String[] args) {
- this.rawArgs = args;
- }
/**
* {@inheritDoc}
@@ -353,16 +343,7 @@
try
{
- if (rawArgs != null) {
- for (String rawArg : rawArgs) {
- if (rawArg.contains(ToolConstants.OPTION_LONG_HELP) ||
- (rawArg.charAt(1) == ToolConstants.OPTION_SHORT_HELP) || (rawArg.
- charAt(1) == '?')) {
- // used for usage default values only
- secureArgsList.initArgumentsWithConfiguration();
- }
- }
- }
+ secureArgsList.initArgumentsWithConfiguration();
}
catch (ConfigException ce)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ManagementContextFactory.java
index 61f3742..1030036 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/ManagementContextFactory.java
@@ -88,14 +88,6 @@
/**
- * Set the raw arguments (used for default value setting).
- *
- * @param args raw arguments.
- */
- public void setRawArguments(String[] args);
-
-
- /**
* Validates any global arguments passed to the application.
* Implementations of this method should check that the values
* passed to their global arguments are valid and are not
--
Gitblit v1.10.0