From 0f8c0db941311b7e34f0abc3299385175b9051cb Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 15:33:02 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - replaced ToolConstants by ArgumentConstants. - deleted ToolConstants.
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java | 4
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 14
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java | 4
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java | 6
opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 14
opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 7
opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java | 2
/dev/null | 785 -------------------------------------------------
opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 2
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 6
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 6
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 9
opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java | 2
45 files changed, 71 insertions(+), 860 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
index 8d9008f..a76a97a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java
@@ -28,7 +28,6 @@
package org.opends.guitools.controlpanel;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 2cda6cd..971063a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -60,7 +60,6 @@
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.util.StaticUtils;
@@ -78,6 +77,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* The class used to provide some CLI interface in the uninstall.
@@ -1300,8 +1300,8 @@
println();
printErrorMessage(ERR_UNINSTALL_ERROR_UPDATING_REMOTE_FORCE.get(
"--"+parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
- "--"+ToolConstants.OPTION_LONG_BINDPWD,
- "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+ "--"+OPTION_LONG_BINDPWD,
+ "--"+OPTION_LONG_BINDPWD_FILE,
exceptionMsg));
}
else
@@ -1311,8 +1311,8 @@
ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
"--"+
parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
- "--"+ToolConstants.OPTION_LONG_BINDPWD,
- "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+ "--"+OPTION_LONG_BINDPWD,
+ "--"+OPTION_LONG_BINDPWD_FILE,
"--"+parser.forceOnErrorArg.getLongIdentifier(),
exceptionMsg));
}
@@ -1472,8 +1472,8 @@
ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
"--"+
parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
- "--"+ToolConstants.OPTION_LONG_BINDPWD,
- "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+ "--"+OPTION_LONG_BINDPWD,
+ "--"+OPTION_LONG_BINDPWD_FILE,
"--"+parser.forceOnErrorArg.getLongIdentifier(),
Utils.getMessageFromCollection(exceptionMsgs,
Constants.LINE_SEPARATOR));
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 29fd356..9d99e8e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -61,7 +61,6 @@
import org.opends.server.admin.std.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.ConfigureWindowsService;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.StaticUtils;
@@ -70,6 +69,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.util.Utils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.io.*;
import java.net.InetAddress;
@@ -2073,8 +2073,8 @@
ERR_UNINSTALL_ERROR_UPDATING_REMOTE_NO_FORCE.get(
"--"+
parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
- "--"+ToolConstants.OPTION_LONG_BINDPWD,
- "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
+ "--"+OPTION_LONG_BINDPWD,
+ "--"+OPTION_LONG_BINDPWD_FILE,
"--"+parser.forceOnErrorArg.getLongIdentifier(),
ae.getMessageObject());
throw new ApplicationException(ae.getType(), msg, ae);
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index a418c17..0d87259 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -37,7 +37,7 @@
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.admin.client.cli.SecureConnectionCliParser;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
-import org.opends.server.tools.ToolConstants;
+
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -47,7 +47,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* Class used to parse and populate the arguments of the Uninstaller.
@@ -193,7 +193,7 @@
defaultArgs.remove(secureArgsList.hostNameArg);
defaultArgs.remove(secureArgsList.portArg);
referencedHostNameArg = new StringArgument("referencedHostName",
- ToolConstants.OPTION_SHORT_HOST,
+ OPTION_SHORT_HOST,
OPTION_LONG_REFERENCED_HOST_NAME, false, false, true,
INFO_HOST_PLACEHOLDER.get(),
UserData.getDefaultHostName(), OPTION_LONG_REFERENCED_HOST_NAME,
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
index 43ddd95..c134af9 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -31,8 +31,8 @@
import com.forgerock.opendj.cli.ArgumentParser;
import static org.opends.messages.QuickSetupMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.DynamicConstants.PRINTABLE_VERSION_STRING;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.quicksetup.util.Utils;
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 04db08c..ef7f76e 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -28,6 +28,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.util.Utils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -35,7 +36,6 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.quicksetup.*;
import org.opends.quicksetup.installer.InstallerHelper;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;
@@ -155,7 +155,7 @@
argList.toArray(args);
if (noPropertiesFile)
{
- args[argList.size()] = "--" + ToolConstants.OPTION_LONG_NO_PROP_FILE;
+ args[argList.size()] = "--" + OPTION_LONG_NO_PROP_FILE;
}
ProcessBuilder pb = new ProcessBuilder(args);
Map<String, String> env = pb.environment();
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index be332dd..cfff15c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -34,9 +34,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.io.File;
import java.io.FileInputStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java
index d39fb81..cada62e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/TaskScheduleArgs.java
@@ -27,7 +27,7 @@
package org.opends.server.admin.client.cli;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.text.ParseException;
import java.util.Collections;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 12cac47..1ea9626 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -75,7 +75,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
index d6e178f..7180fcf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
@@ -80,7 +80,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* This class provides a very basic tool that can be used to configure some of
@@ -364,8 +364,8 @@
argParser.setUsageArgument(showUsage);
serverRoot = new StringArgument("serverRoot",
- ToolConstants.OPTION_SHORT_SERVER_ROOT,
- ToolConstants.OPTION_LONG_SERVER_ROOT,
+ OPTION_SHORT_SERVER_ROOT,
+ OPTION_LONG_SERVER_ROOT,
false, false, true, INFO_SERVER_ROOT_DIR_PLACEHOLDER.get(), null,
null, null);
serverRoot.setHidden(true);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
index 98f7fd5..5d1dc44 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
@@ -51,7 +51,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* This class is used to configure the Windows service for this instance on
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
index a0ae6b7..7e4a148 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
@@ -27,7 +27,7 @@
package org.opends.server.tools;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
index 721238b..6030137 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
@@ -68,7 +68,7 @@
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
index 5f9c7ae..5b00874 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
@@ -67,7 +67,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.admin.std.server.BackendCfg;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index 44cc507..32625a1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -33,7 +33,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index 2405fc5..b32bdf0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -27,7 +27,7 @@
package org.opends.server.tools;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.util.Collection;
import java.util.HashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
index fc6a69e..4145db5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
@@ -27,7 +27,6 @@
package org.opends.server.tools;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import java.io.File;
import java.util.LinkedHashSet;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
index 54c4eb1..7c71500 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPAuthenticationHandler.java
@@ -73,7 +73,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
index dca3b45..bb167ef 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
@@ -62,7 +62,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
index e9653fa..fada46d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
@@ -64,7 +64,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
index 77d822f..217db6f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
@@ -79,7 +79,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index d8bd1a3..8914617 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -60,7 +60,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
/**
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
index b6d2857..488e492 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
@@ -58,7 +58,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
index 2375073..17094e7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
@@ -69,7 +69,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
index b09cbe0..ff4b806 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
@@ -72,7 +72,7 @@
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
index fb2b0c0..4e10e0b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
@@ -50,7 +50,7 @@
import com.forgerock.opendj.cli.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java b/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
index 5be008c..0b0a6ac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
@@ -63,7 +63,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
@@ -492,7 +492,7 @@
table.appendCell(buf.toString());
}
TextTablePrinter printer = new TextTablePrinter(out);
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
table.print(printer);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
index 257910a..73b1f38 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
@@ -64,7 +64,7 @@
import static org.opends.server.extensions.
PasswordPolicyStateExtendedOperation.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.util.EmbeddedUtils;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
index 236d3ee..f622691 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
@@ -35,7 +35,7 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DecodeException;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.tools.tasks.TaskClient;
import org.opends.server.tools.tasks.TaskEntry;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index c3964a6..36bf2e3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -67,7 +67,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.tools.tasks.TaskTool;
import org.opends.server.admin.std.server.BackendCfg;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
index 59e5c4d..f13ab31 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
@@ -71,7 +71,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
/**
* This class provides a tool that can send a request to the Directory Server
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ToolConstants.java b/opendj3-server-dev/src/server/org/opends/server/tools/ToolConstants.java
deleted file mode 100644
index 470f42c..0000000
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ToolConstants.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
- */
-package org.opends.server.tools;
-
-
-
-/**
- * This class defines a number of constants used in one or more Directory Server
- * tools.
- */
-public class ToolConstants
-{
- /**
- * The name of the SASL property that can be used to provide the
- * authentication ID for the bind.
- */
- public static final String SASL_PROPERTY_AUTHID = "authid";
-
-
-
- /**
- * The name of the SASL property that can be used to provide the authorization
- * ID for the bind.
- */
- public static final String SASL_PROPERTY_AUTHZID = "authzid";
-
-
-
- /**
- * The name of the SASL property that can be used to provide the digest URI
- * for the bind.
- */
- public static final String SASL_PROPERTY_DIGEST_URI = "digest-uri";
-
-
-
- /**
- * The name of the SASL property that can be used to provide the KDC for use
- * in Kerberos authentication.
- */
- public static final String SASL_PROPERTY_KDC = "kdc";
-
-
-
- /**
- * The name of the SASL property that can be used to provide the quality of
- * protection for the bind.
- */
- public static final String SASL_PROPERTY_QOP = "qop";
-
-
-
- /**
- * The name of the SASL property that can be used to provide the realm for the
- * bind.
- */
- public static final String SASL_PROPERTY_REALM = "realm";
-
-
-
- /**
- * The name of the SASL property that can be used to provide trace information
- * for a SASL ANONYMOUS request.
- */
- public static final String SASL_PROPERTY_TRACE = "trace";
-
-
- /**
- * The name of the OpenDJ configuration directory in the user
- * home directory.
- */
- public static final String DEFAULT_OPENDS_CONFIG_DIR = ".opendj";
-
- /**
- * The default properties file name.
- */
- public static final String DEFAULT_OPENDS_PROPERTIES_FILE_NAME =
- "tools";
-
- /**
- * The default properties file extension.
- */
- public static final String DEFAULT_OPENDS_PROPERTIES_FILE_EXTENSION =
- ".properties";
-
-
- /**
- * The value for the short option configClass.
- */
- public static final char OPTION_SHORT_CONFIG_CLASS = 'C';
-
- /**
- * The value for the long option configClass.
- */
- public static final String OPTION_LONG_CONFIG_CLASS = "configClass";
-
- /**
- * The value for the short option batchFilePath.
- */
- public static final char OPTION_SHORT_BATCH_FILE_PATH = 'F';
-
- /**
- * The value for the long option batchFilePath .
- */
- public static final String OPTION_LONG_BATCH_FILE_PATH =
- "batchFilePath";
-
- /**
- * The value for the short option hostname.
- */
- public static final char OPTION_SHORT_HOST = 'h';
-
- /**
- * The value for the long option hostname.
- */
- public static final String OPTION_LONG_HOST = "hostname";
-
- /**
- * The value for the short option port.
- */
- public static final char OPTION_SHORT_PORT = 'p';
-
- /**
- * The value for the long option port.
- */
- public static final String OPTION_LONG_PORT = "port";
-
- /**
- * The value for the short option useSSL.
- */
- public static final char OPTION_SHORT_USE_SSL = 'Z';
-
- /**
- * The value for the long option useSSL.
- */
- public static final String OPTION_LONG_USE_SSL = "useSSL";
-
- /**
- * The value for the short option baseDN.
- */
- public static final char OPTION_SHORT_BASEDN = 'b';
-
- /**
- * The value for the long option baseDN.
- */
- public static final String OPTION_LONG_BASEDN = "baseDN";
-
- /**
- * The value for the short option rootUserDN.
- */
- public static final char OPTION_SHORT_ROOT_USER_DN = 'D';
-
- /**
- * The value for the long option rootUserDN.
- */
- public static final String OPTION_LONG_ROOT_USER_DN = "rootUserDN";
-
- /**
- * The value for the short option bindDN.
- */
- public static final char OPTION_SHORT_BINDDN = 'D';
-
- /**
- * The value for the long option bindDN.
- */
- public static final String OPTION_LONG_BINDDN = "bindDN";
-
- /**
- * The value for the short option bindPassword.
- */
- public static final char OPTION_SHORT_BINDPWD = 'w';
-
- /**
- * The value for the long option bindPassword.
- */
- public static final String OPTION_LONG_BINDPWD = "bindPassword";
-
- /**
- * The value for the short option bindPasswordFile.
- */
- public static final char OPTION_SHORT_BINDPWD_FILE = 'j';
-
- /**
- * The value for the long option bindPasswordFile.
- */
- public static final String OPTION_LONG_BINDPWD_FILE = "bindPasswordFile";
-
- /**
- * The value for the short option compress.
- */
- public static final char OPTION_SHORT_COMPRESS = 'c';
-
- /**
- * The value for the long option compress.
- */
- public static final String OPTION_LONG_COMPRESS = "compress";
-
- /**
- * The value for the short option filename.
- */
- public static final char OPTION_SHORT_FILENAME = 'f';
-
- /**
- * The value for the long option filename.
- */
- public static final String OPTION_LONG_FILENAME = "filename";
-
- /**
- * The value for the short option ldifFile.
- */
- public static final char OPTION_SHORT_LDIF_FILE = 'l';
-
- /**
- * The value for the long option ldifFile.
- */
- public static final String OPTION_LONG_LDIF_FILE = "ldifFile";
-
- /**
- * The value for the short option useStartTLS.
- */
- public static final char OPTION_SHORT_START_TLS = 'q';
-
- /**
- * The value for the long option useStartTLS.
- */
- public static final String OPTION_LONG_START_TLS = "useStartTLS";
-
- /**
- * The value for the short option randomSeed.
- */
- public static final char OPTION_SHORT_RANDOM_SEED = 's';
-
- /**
- * The value for the long option randomSeed.
- */
- public static final String OPTION_LONG_RANDOM_SEED = "randomSeed";
-
- /**
- * The value for the short option keyStorePath.
- */
- public static final char OPTION_SHORT_KEYSTOREPATH = 'K';
-
- /**
- * The value for the long option keyStorePath.
- */
- public static final String OPTION_LONG_KEYSTOREPATH = "keyStorePath";
-
- /**
- * The value for the short option trustStorePath.
- */
- public static final char OPTION_SHORT_TRUSTSTOREPATH = 'P';
-
- /**
- * The value for the long option trustStorePath.
- */
- public static final String OPTION_LONG_TRUSTSTOREPATH = "trustStorePath";
-
- /**
- * The value for the short option keyStorePassword.
- */
- public static final char OPTION_SHORT_KEYSTORE_PWD = 'W';
-
- /**
- * The value for the long option keyStorePassword.
- */
- public static final String OPTION_LONG_KEYSTORE_PWD = "keyStorePassword";
-
- /**
- * The value for the short option trustStorePassword.
- */
- public static final char OPTION_SHORT_TRUSTSTORE_PWD = 'T';
-
- /**
- * The value for the long option trustStorePassword.
- */
- public static final String OPTION_LONG_TRUSTSTORE_PWD = "trustStorePassword";
-
- /**
- * The value for the short option keyStorePasswordFile .
- */
- public static final char OPTION_SHORT_KEYSTORE_PWD_FILE = 'u';
-
- /**
- * The value for the long option keyStorePasswordFile .
- */
- public static final String OPTION_LONG_KEYSTORE_PWD_FILE =
- "keyStorePasswordFile";
-
- /**
- * The value for the short option keyStorePasswordFile .
- */
- public static final char OPTION_SHORT_TRUSTSTORE_PWD_FILE = 'U';
-
- /**
- * The value for the long option keyStorePasswordFile .
- */
- public static final String OPTION_LONG_TRUSTSTORE_PWD_FILE =
- "trustStorePasswordFile";
- /**
- * The value for the short option trustAll .
- */
- public static final char OPTION_SHORT_TRUSTALL = 'X';
-
- /**
- * The value for the long option trustAll .
- */
- public static final String OPTION_LONG_TRUSTALL = "trustAll";
-
- /**
- * The value for the short option trustAll .
- */
- public static final char OPTION_SHORT_REMOTE = 'r';
-
- /**
- * The value for the long option trustAll .
- */
- public static final String OPTION_LONG_REMOTE = "remote";
-
- /**
- * The value for the short option certNickname .
- */
- public static final char OPTION_SHORT_CERT_NICKNAME = 'N';
-
- /**
- * The value for the long option certNickname .
- */
- public static final String OPTION_LONG_CERT_NICKNAME = "certNickname";
-
- /**
- * The value for the long option assertionFilter .
- */
- public static final String OPTION_LONG_ASSERTION_FILE = "assertionFilter";
-
- /**
- * The value for the short option dry-run.
- */
- public static final char OPTION_SHORT_DRYRUN = 'n';
-
- /**
- * The value for the long option dry-run.
- */
- public static final String OPTION_LONG_DRYRUN = "dry-run";
-
- /**
- * The value for the short option help.
- */
- public static final char OPTION_SHORT_HELP = 'H';
-
- /**
- * The value for the long option help.
- */
- public static final String OPTION_LONG_HELP = "help";
-
- /**
- * The value for the long option cli.
- */
- public static final String OPTION_LONG_CLI = "cli";
-
- /**
- * The value for the short option cli.
- */
- public static final char OPTION_SHORT_CLI = 'i';
-
- /**
- * The value for the short option proxyAs.
- */
- public static final char OPTION_SHORT_PROXYAUTHID = 'Y';
-
- /**
- * The value for the long option proxyAs.
- */
- public static final String OPTION_LONG_PROXYAUTHID = "proxyAs";
-
- /**
- * The value for the short option saslOption.
- */
- public static final char OPTION_SHORT_SASLOPTION = 'o';
-
- /**
- * The value for the long option saslOption.
- */
- public static final String OPTION_LONG_SASLOPTION = "saslOption";
-
- /**
- * The value for the short option geteffectiverights control authzid.
- */
- public static final char OPTION_SHORT_EFFECTIVERIGHTSUSER = 'g';
-
- /**
- * The value for the long option geteffectiverights control authzid.
- */
- public static final String OPTION_LONG_EFFECTIVERIGHTSUSER =
- "getEffectiveRightsAuthzid";
-
- /**
- * The value for the short option geteffectiverights control attributes.
- */
- public static final char OPTION_SHORT_EFFECTIVERIGHTSATTR = 'e';
-
- /**
- * The value for the long option geteffectiverights control specific
- * attribute list.
- */
- public static final String OPTION_LONG_EFFECTIVERIGHTSATTR =
- "getEffectiveRightsAttribute";
-
- /**
- * The value for the short option protocol version attributes.
- */
- public static final char OPTION_SHORT_PROTOCOL_VERSION = 'V';
-
- /**
- * The value for the long option protocol version
- * attribute.
- */
- public static final String OPTION_LONG_PROTOCOL_VERSION =
- "ldapVersion";
-
- /**
- * The value for the long option connect timeout attribute.
- */
- public static final String OPTION_LONG_CONNECT_TIMEOUT =
- "connectTimeout";
-
- /**
- * The value for the long option version.
- */
- public static final char OPTION_SHORT_PRODUCT_VERSION = 'V';
-
- /**
- * The value for the long option version.
- */
- public static final String OPTION_LONG_PRODUCT_VERSION = "version";
-
-
- /**
- * The value for the short option groupName attributes.
- */
- public static final char OPTION_SHORT_GROUPNAME = 'g';
-
- /**
- * The value for the long option groupName
- * attribute.
- */
- public static final String OPTION_LONG_GROUPNAME= "groupName";
-
- /**
- * The value for the short option newGroupName attribute.
- */
- public static final char OPTION_SHORT_NEWGROUPNAME = 'n';
-
- /**
- * The value for the long option groupName
- * attribute.
- */
- public static final String OPTION_LONG_NEWGROUPNAME= "newGroupName";
-
- /**
- * The value for the short option backendName attributes.
- */
- public static final char OPTION_SHORT_BACKENDNAME = 'b';
-
- /**
- * The value for the long option backendName
- * attribute.
- */
- public static final String OPTION_LONG_BACKENDNAME= "backendName";
-
- /**
- * The value for the short option serverID attributes.
- */
- public static final String OPTION_SHORT_SERVERID = null;
-
- /**
- * The value for the long option serverID
- * attribute.
- */
- public static final String OPTION_LONG_SERVERID= "serverID";
-
- /**
- * The value for the short option userID attributes.
- */
- public static final String OPTION_SHORT_USERID = null;
-
- /**
- * The value for the long option userID
- * attribute.
- */
- public static final String OPTION_LONG_USERID= "userID";
-
- /**
- * The value for the short option set.
- */
- public static final Character OPTION_SHORT_SET = null;
-
- /**
- * The value for the long option set.
- */
- public static final String OPTION_LONG_SET = "set";
-
- /**
- * Value for the server root option short form.
- */
- public static final Character OPTION_SHORT_SERVER_ROOT = 'R';
-
- /**
- * Value for the server root option long form.
- */
- public static final String OPTION_LONG_SERVER_ROOT = "serverRoot";
-
- /**
- * Value for the quiet option short form.
- */
- public static final Character OPTION_SHORT_QUIET = 'Q';
-
- /**
- * Value for the quiet option long form.
- */
- public static final String OPTION_LONG_QUIET = "quiet";
-
- /**
- * Value for non-interactive session short form.
- */
- public static final Character OPTION_SHORT_NO_PROMPT = 'n';
-
- /**
- * Value for non-interactive session long form.
- */
- public static final String OPTION_LONG_NO_PROMPT = "no-prompt";
-
- /**
- * Long form of script friendly option.
- */
- public static final String OPTION_LONG_SCRIPT_FRIENDLY = "script-friendly";
-
- /**
- * Short form of script friendly option.
- */
- public static final Character OPTION_SHORT_SCRIPT_FRIENDLY = 's';
-
- /**
- * Value for verbose option short form.
- */
- public static final Character OPTION_SHORT_VERBOSE = 'v';
-
- /**
- * Value for verbose option long form.
- */
- public static final String OPTION_LONG_VERBOSE = "verbose";
-
- /**
- * Scheduled start date/time option long form.
- */
- public static final String OPTION_LONG_START_DATETIME = "start";
-
- /**
- * Scheduled start date/time option short form.
- */
- public static final Character OPTION_SHORT_START_DATETIME = 't';
-
- /**
- * Recurring task option long form.
- */
- public static final String OPTION_LONG_RECURRING_TASK = "recurringTask";
-
- /**
- * Recurring task option short form.
- */
- public static final Character OPTION_SHORT_RECURRING_TASK = null;
-
- /**
- * Subentries control option long form.
- */
- public static final String OPTION_LONG_SUBENTRIES = "subEntries";
-
- /**
- * Subentries control option short form.
- */
- public static final Character OPTION_SHORT_SUBENTRIES = null;
-
- /**
- * The value for the long option propertiesFilePAth .
- */
- public static final String OPTION_LONG_PROP_FILE_PATH = "propertiesFilePath";
-
- /**
- * Argument that specifies that an operation be scheduled as a
- * task but the scheduling utility should not exit until the task
- * has completed.
- */
- public static final String OPTION_LONG_SYNCHRONOUS_TASK_MODE =
- "synchronousTaskMode";
-
- /**
- * Argument that specifies that an operation be scheduled as a
- * task but the scheduling utility should not exit until the task
- * has completed.
- */
- public static final Character OPTION_SHORT_SYNCHRONOUS_TASK_MODE = 'Y';
-
-
- /**
- * The value for the long option propertiesFilePAth .
- */
- public static final String OPTION_LONG_NO_PROP_FILE = "noPropertiesFile";
-
-
- /**
- * Long form of referenced host name.
- */
- public static final String OPTION_LONG_REFERENCED_HOST_NAME =
- "referencedHostName";
-
-
- /**
- * Long form of admin UID.
- */
- public static final String OPTION_LONG_ADMIN_UID = "adminUID";
-
- /**
- * Long form of admin password.
- */
- public static final String OPTION_LONG_ADMIN_PWD = "adminPassword";
-
- /**
- * Long form of admin password file.
- */
- public static final String OPTION_LONG_ADMIN_PWD_FILE = "adminPasswordFile";
-
- /**
- * Long form of report authorization ID connection option.
- */
- public static final String OPTION_LONG_REPORT_AUTHZ_ID = "reportAuthzID";
-
-
- /**
- * Long form of use password policy control connection option.
- */
- public static final String OPTION_LONG_USE_PW_POLICY_CTL =
- "usePasswordPolicyControl";
-
-
- /**
- * Long form of use SASL external connection option.
- */
- public static final String OPTION_LONG_USE_SASL_EXTERNAL = "useSASLExternal";
-
-
- /**
- * Long form of option for the command-line encoding option.
- */
- public static final String OPTION_LONG_ENCODING = "encoding";
-
-
- /**
- * Long form of option specifying no wrapping of the command-line.
- */
- public static final String OPTION_LONG_DONT_WRAP = "dontWrap";
-
-
- /**
- * Long form of email notification upon completion option.
- */
- public static final String OPTION_LONG_COMPLETION_NOTIFICATION_EMAIL =
- "completionNotify";
-
- /**
- * Short form of email notification upon completion option.
- */
- public static final Character OPTION_SHORT_COMPLETION_NOTIFICATION_EMAIL =
- null;
-
-
- /**
- * Long form of email notification upon error option.
- */
- public static final String OPTION_LONG_ERROR_NOTIFICATION_EMAIL =
- "errorNotify";
-
-
- /**
- * Short form of email notification upon error option.
- */
- public static final Character OPTION_SHORT_ERROR_NOTIFICATION_EMAIL =
- null;
-
-
- /**
- * Long form of dependency option.
- */
- public static final String OPTION_LONG_DEPENDENCY = "dependency";
-
-
- /**
- * Short form of dependency option.
- */
- public static final Character OPTION_SHORT_DEPENDENCY = null;
-
-
- /**
- * Long form of failed dependency action option.
- */
- public static final String OPTION_LONG_FAILED_DEPENDENCY_ACTION =
- "failedDependencyAction";
-
-
- /**
- * Short form of failed dependency action option.
- */
- public static final Character OPTION_SHORT_FAILED_DEPENDENCY_ACTION = null;
-
-
- /**
- * The default separator to be used in tables.
- */
- public static final String LIST_TABLE_SEPARATOR = ":";
-
- /**
- * Display the equivalent non-interactive command.
- */
- public static final String OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT =
- "displayCommand";
-
- /**
- * The path where we write the equivalent non-interactive command.
- */
- public static final String OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH =
- "commandFilePath";
-
- /**
- * The value for the long option advanced.
- */
- public static final String OPTION_DSCFG_LONG_ADVANCED = "advanced";
-
- /**
- * The value for the short option advanced.
- */
- public static final Character OPTION_DSCFG_SHORT_ADVANCED = null;
-
- /**
- * The value for the long option ignore errors.
- */
- public static final String OPTION_LONG_IGNORE_ERRORS = "ignoreErrors";
-
- /**
- * The value for the long option force upgrade.
- */
- public static final String OPTION_LONG_FORCE_UPGRADE = "force";
-
- /**
- * The value for the long option restore backup.
- */
- public static final String OPTION_LONG_RESTORE_UPGRADE = "restore";
-
- /**
- * The value for the long option to automatically
- * accept the license if present.
- */
- public static final String OPTION_LONG_ACCEPT_LICENSE = "acceptLicense";
-}
-
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index d8feb07..48940d1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -29,7 +29,7 @@
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index 4b21c96..6d2f545 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -32,6 +32,7 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.admin.PropertyException.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import java.util.Collection;
import java.util.Collections;
@@ -77,7 +78,6 @@
import org.opends.server.admin.client.OperationRejectedException;
import org.opends.server.admin.condition.Condition;
import org.opends.server.admin.condition.ContainsCondition;
-import org.opends.server.tools.ToolConstants;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -328,7 +328,7 @@
TextTablePrinter printer = new TextTablePrinter(app.getErrorStream());
printer.setColumnWidth(1, 0);
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
builder.print(printer);
app.println();
app.pressReturnToContinue();
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 5b284b8..2da99d2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -32,7 +32,7 @@
import static org.opends.messages.DSConfigMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.*;
import static org.opends.server.util.ServerConstants.PROPERTY_SCRIPT_NAME;
import static org.opends.server.util.StaticUtils.*;
@@ -569,10 +569,10 @@
OPTION_LONG_NO_PROMPT,
INFO_DESCRIPTION_NO_PROMPT.get());
- advancedModeArgument = new BooleanArgument(OPTION_DSCFG_LONG_ADVANCED,
- OPTION_DSCFG_SHORT_ADVANCED, OPTION_DSCFG_LONG_ADVANCED,
+ advancedModeArgument = new BooleanArgument(OPTION_LONG_ADVANCED,
+ null, OPTION_LONG_ADVANCED,
INFO_DSCFG_DESCRIPTION_ADVANCED.get());
- advancedModeArgument.setPropertyName(OPTION_DSCFG_LONG_ADVANCED);
+ advancedModeArgument.setPropertyName(OPTION_LONG_ADVANCED);
showUsageArgument = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
OPTION_LONG_HELP, INFO_DSCFG_DESCRIPTION_SHOW_GROUP_USAGE_SUMMARY
@@ -585,11 +585,11 @@
INFO_DESCRIPTION_BATCH_FILE_PATH.get());
displayEquivalentArgument = new BooleanArgument(
- OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT,
- null, OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT,
+ OPTION_LONG_DISPLAY_EQUIVALENT,
+ null, OPTION_LONG_DISPLAY_EQUIVALENT,
INFO_DSCFG_DESCRIPTION_DISPLAY_EQUIVALENT.get());
advancedModeArgument.setPropertyName(
- OPTION_DSCFG_LONG_DISPLAY_EQUIVALENT);
+ OPTION_LONG_DISPLAY_EQUIVALENT);
equivalentCommandFileArgument = new StringArgument(
OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, null,
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
index 412a0c4..4e1f15d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
@@ -29,6 +29,7 @@
import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import java.io.PrintStream;
import java.util.Collection;
@@ -61,7 +62,6 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagedObjectDecodingException;
import org.opends.server.admin.client.ManagementContext;
-import org.opends.server.tools.ToolConstants;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ReturnCode;
@@ -328,7 +328,7 @@
builder.print(printer);
} else {
TextTablePrinter printer = new TextTablePrinter(out);
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
printer.setColumnWidth(1, 0);
builder.print(printer);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index cc6f1e2..e6061bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -44,7 +44,8 @@
import com.forgerock.opendj.cli.ClientException;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
-import org.opends.server.tools.ToolConstants;
+import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
+import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
import com.forgerock.opendj.cli.CommandBuilder;
import com.forgerock.opendj.cli.ConsoleApplication;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
@@ -365,8 +366,8 @@
// This is not a help command
continue;
}
- if (rawArg.contains(ToolConstants.OPTION_LONG_HELP) ||
- (rawArg.charAt(1) == ToolConstants.OPTION_SHORT_HELP) || (rawArg.
+ if (rawArg.contains(OPTION_LONG_HELP) ||
+ (rawArg.charAt(1) == OPTION_SHORT_HELP) || (rawArg.
charAt(1) == '?')) {
// used for usage help default values only
secureArgsList.initArgumentsWithConfiguration();
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
index fedb602..1ffc323 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
@@ -28,6 +28,7 @@
import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import java.io.PrintStream;
import java.util.List;
@@ -53,7 +54,6 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagedObjectDecodingException;
import org.opends.server.admin.client.ManagementContext;
-import org.opends.server.tools.ToolConstants;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ReturnCode;
@@ -513,7 +513,7 @@
}
TextTablePrinter printer = new TextTablePrinter(out);
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
builder.print(printer);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
index 6af2c72..c2d4123 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java
@@ -29,7 +29,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.io.File;
import java.io.OutputStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 9a4d190..5ff3953 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -62,6 +62,7 @@
import static org.opends.quicksetup.util.Utils.getMessage;
import static org.opends.quicksetup.util.Utils.getMessageFromCollection;
import static org.opends.quicksetup.util.Utils.getServerClock;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import org.opends.server.admin.*;
import org.opends.server.admin.client.ManagementContext;
@@ -75,7 +76,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.tools.tasks.TaskScheduleInteraction;
import org.opends.server.tools.tasks.TaskScheduleUserData;
@@ -147,7 +147,6 @@
ERR_CONFIRMATION_TRIES_LIMIT_REACHED;
import static org.opends.quicksetup.util.Utils.getFirstValue;
import static org.opends.quicksetup.util.Utils.getThrowableMsg;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
import static org.opends.server.util.StaticUtils.close;
@@ -583,7 +582,7 @@
else
{
println(ERR_REPLICATION_VALID_SUBCOMMAND_NOT_FOUND.get(
- "--"+ToolConstants.OPTION_LONG_NO_PROMPT));
+ "--"+OPTION_LONG_NO_PROMPT));
println(LocalizableMessage.raw(argParser.getUsage()));
returnValue = ERROR_USER_DATA;
subcommandLaunched = false;
@@ -7718,7 +7717,7 @@
{
printer = new TextTablePrinter(out);
((TextTablePrinter)printer).setColumnSeparator(
- ToolConstants.LIST_TABLE_SEPARATOR);
+ LIST_TABLE_SEPARATOR);
}
tableBuilder.print(printer);
}
@@ -7788,7 +7787,7 @@
printer = new TextTablePrinter(getOutputStream());
((TextTablePrinter)printer).setColumnSeparator(
- ToolConstants.LIST_TABLE_SEPARATOR);
+ LIST_TABLE_SEPARATOR);
}
tableBuilder.print(printer);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
index 5825764..e97e702 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
@@ -51,7 +51,7 @@
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java b/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
index ef98bf2..7b2f066 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java
@@ -60,7 +60,6 @@
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.config.ConfigException;
import com.forgerock.opendj.cli.ClientException;
-import org.opends.server.tools.ToolConstants;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
@@ -79,6 +78,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.quicksetup.util.Utils.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
/**
* The class used to provide some CLI interface to display status.
@@ -1004,7 +1004,7 @@
}
}
TextTablePrinter printer = new TextTablePrinter(getOutputStream());
- printer.setColumnSeparator(ToolConstants.LIST_TABLE_SEPARATOR);
+ printer.setColumnSeparator(LIST_TABLE_SEPARATOR);
table.print(printer);
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
index e34bc05..e856e63 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
@@ -42,8 +42,6 @@
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;
-import static org.opends.server.tools.ToolConstants.*;
-
import org.opends.server.types.LDAPException;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index 7220bf7..1657452 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -26,11 +26,11 @@
package org.opends.server.tools.upgrade;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
import static org.opends.server.util.StaticUtils.filterExitCode;
import static org.opends.server.tools.upgrade.FormattedNotificationCallback.*;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_ERROR;
import static org.opends.server.tools.upgrade.Upgrade.EXIT_CODE_SUCCESS;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import java.io.IOException;
import java.io.InputStream;
diff --git a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
index 9bd75e7..e7a0a78 100644
--- a/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
+++ b/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
@@ -40,7 +40,7 @@
import org.testng.annotations.Test;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.testng.Assert.*;
/**
--
Gitblit v1.10.0