From 69bcc5da5dafd4e5c4af9478f8db2de0fd5af413 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 06 May 2014 09:17:27 +0000
Subject: [PATCH] OPENDJ-1303 "opendj-cli" - Removed && replaced StaticUtils.filterExitCode by com.forgerock.opendj.cli.Utils.filterExitCode; - Removed SetupUtils.getDefaultJMXPort and replaced it by CliConstants.DEFAULT_JMX_PORT. - Removed && replaced Utilities.OBFUSCATED_VALUE by com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE; - Removed && replaced Utils.getThrowableMsg by com.forgerock.opendj.cli.Utils.getThrowableMsg;
---
opendj3-server-dev/src/server/org/opends/server/util/SetupUtils.java | 32 +-----
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 7
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 1
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java | 1
opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java | 29 -----
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java | 3
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 1
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 60 -----------
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 6 -
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java | 1
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java | 2
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java | 5
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java | 5
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 1
opendj3-server-dev/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java | 22 +++-
opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java | 1
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java | 7
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java | 26 +++--
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 3
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 2
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java | 5
54 files changed, 110 insertions(+), 172 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index 5ac740d..e7e2ba6 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -29,6 +29,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
import java.io.File;
import java.util.ArrayList;
@@ -475,7 +476,7 @@
if (Utilities.mustObfuscate(attrName,
getInfo().getServerDescriptor().getSchema()))
{
- return Utilities.OBFUSCATED_VALUE;
+ return OBFUSCATED_VALUE;
}
else
{
@@ -530,7 +531,7 @@
if (Utilities.mustObfuscate(attrName,
getInfo().getServerDescriptor().getSchema()))
{
- returnValue = attrName + ": " +Utilities.OBFUSCATED_VALUE;
+ returnValue = attrName + ": " + OBFUSCATED_VALUE;
}
else
{
@@ -759,7 +760,7 @@
{
if (args.get(i-1).equalsIgnoreCase(argName))
{
- args.set(i, Utilities.OBFUSCATED_VALUE);
+ args.set(i, OBFUSCATED_VALUE);
break;
}
}
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index e4ae18f..8d196f8 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -29,6 +29,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -1048,7 +1049,7 @@
args.add("--adminUID");
args.add("admin");
args.add("--adminPassword");
- args.add(Utilities.OBFUSCATED_VALUE);
+ args.add(OBFUSCATED_VALUE);
args.add("--trustAll");
args.add("--no-prompt");
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 811968f..2e746c4 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -30,6 +30,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.cli.Utils.isDN;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -675,7 +676,7 @@
}
else
{
- LocalizableMessage msg = Utils.getThrowableMsg(
+ LocalizableMessage msg = getThrowableMsg(
INFO_ERROR_CONNECTING_TO_LOCAL.get(), throwable);
errors.add(msg);
}
@@ -755,7 +756,7 @@
// This is a bug
logger.error(LocalizableMessage.raw(
"Unexpected error: "+throwable, throwable));
- errors.add(Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable));
+ errors.add(getThrowableMsg(INFO_BUG_MSG.get(), throwable));
}
}
displayMainPanel();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
index 948053e..b6f9b74 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -30,6 +30,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.cli.Utils.isDN;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -303,7 +304,7 @@
}
else
{
- LocalizableMessage msg = Utils.getThrowableMsg(
+ LocalizableMessage msg = getThrowableMsg(
INFO_ERROR_CONNECTING_TO_LOCAL.get(), throwable);
errors.add(msg);
}
@@ -368,7 +369,7 @@
{
// This is a bug
throwable.printStackTrace();
- errors.add(Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable));
+ errors.add(getThrowableMsg(INFO_BUG_MSG.get(), throwable));
}
}
displayMainPanel();
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 6e459e6..cfb001a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -27,6 +27,7 @@
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
+import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -934,7 +935,7 @@
{
panel.add(
Utilities.createDefaultLabel(
- LocalizableMessage.raw(Utilities.OBFUSCATED_VALUE)), gbc);
+ LocalizableMessage.raw(OBFUSCATED_VALUE)), gbc);
}
else if (!isBinary)
{
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
index e9a58b8..5c6d713 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
@@ -22,11 +22,13 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui.renderer;
import static org.opends.messages.AdminToolMessages.*;
+import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -91,7 +93,7 @@
}
if (isPassword(table, row, column))
{
- return getStringValue(table, Utilities.OBFUSCATED_VALUE, isSelected,
+ return getStringValue(table, OBFUSCATED_VALUE, isSelected,
hasFocus, row, column);
}
else if (value instanceof ObjectClassValue)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 50204a8..0b5a3ef 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -144,12 +144,6 @@
private static File rootDirectory;
private static File instanceRootDirectory;
- /**
- * The string to be used to display an obfuscated value (for instance password
- * value).
- */
- public final static String OBFUSCATED_VALUE = "********";
-
private static String[] attrsToObfuscate =
{ServerConstants.ATTR_USER_PASSWORD};
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 1b985ef..51270ce 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
@@ -29,6 +29,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_BINDPWD;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_BINDPWD_FILE;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import static org.forgerock.util.Utils.joinAsString;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
@@ -543,7 +544,7 @@
{
logger.warn(LocalizableMessage.raw("Error processing task: "+t, t));
throw new UserDataException(Step.CONFIRM_UNINSTALL,
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), t));
+ getThrowableMsg(INFO_BUG_MSG.get(), t));
}
logger.info(LocalizableMessage.raw("interactive: "+interactive));
logger.info(LocalizableMessage.raw("forceOnError: "+forceOnError));
@@ -1253,7 +1254,7 @@
}
else
{
- exceptionMsg = Utils.getThrowableMsg(
+ exceptionMsg = getThrowableMsg(
INFO_ERROR_CONNECTING_TO_LOCAL.get(), ne);
}
} catch (TopologyCacheException te)
@@ -1268,7 +1269,7 @@
} catch (Throwable t)
{
logger.warn(LocalizableMessage.raw("Error connecting to server: "+t, t));
- exceptionMsg = Utils.getThrowableMsg(INFO_BUG_MSG.get(), t);
+ exceptionMsg = getThrowableMsg(INFO_BUG_MSG.get(), t);
}
finally
{
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 714a0fd..dd99030 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
@@ -73,6 +73,7 @@
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import java.io.*;
import java.net.InetAddress;
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
index 469cc14..68ae45f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -73,6 +73,7 @@
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This class is a dialog that appears when the user must provide authentication
@@ -455,7 +456,7 @@
}
else
{
- LocalizableMessage msg = Utils.getThrowableMsg(
+ LocalizableMessage msg = getThrowableMsg(
INFO_ERROR_CONNECTING_TO_LOCAL.get(), throwable);
displayError(msg, INFO_ERROR_TITLE.get());
}
@@ -553,7 +554,7 @@
logger.error(LocalizableMessage.raw("Unexpected throwable: "+throwable,
throwable));
displayError(
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable),
+ getThrowableMsg(INFO_BUG_MSG.get(), throwable),
INFO_ERROR_TITLE.get());
}
cancelButton.setEnabled(true);
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java
index 1d9f857..fcefd14 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -640,7 +640,7 @@
for (int i=0;i<65000 && (defaultJMXPort == -1);i+=1000)
{
- int port = i + org.opends.server.util.SetupUtils.getDefaultJMXPort();
+ int port = i + CliConstants.DEFAULT_JMX_PORT;
boolean isForbidden = false;
if (forbiddenPorts != null)
{
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index 3ccb619..5a52709 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -70,6 +70,7 @@
import static com.forgerock.opendj.cli.Utils.canWrite;
import static com.forgerock.opendj.cli.Utils.isDN;
import static com.forgerock.opendj.cli.Utils.getHostNameForLdapUrl;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This is an abstract class that is in charge of actually performing the
@@ -4863,7 +4864,7 @@
{
logger.error(LocalizableMessage.raw("Error: "+t, t));
throw new ApplicationException(ReturnCode.BUG,
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
+ getThrowableMsg(INFO_BUG_MSG.get(), t), t);
}
}
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 9d6d03a..700fbf9 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -70,6 +70,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import org.opends.server.tools.ConfigureDS;
import org.opends.server.tools.ConfigureWindowsService;
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index 3db8fc9..5fb035b 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -30,6 +30,7 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import java.io.PrintStream;
@@ -288,7 +289,7 @@
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
ReturnCode.BUG,
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
+ getThrowableMsg(INFO_BUG_MSG.get(), t), t);
LocalizableMessage msg = getFormattedError(ex, true);
notifyListeners(msg);
logger.error(LocalizableMessage.raw("Error installing.", t));
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index bbe7c71..6b61247 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -61,6 +61,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This class is a dialog that appears when the user wants to configure
@@ -572,7 +573,7 @@
// Bug
throwable.printStackTrace();
displayError(
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable),
+ getThrowableMsg(INFO_BUG_MSG.get(), throwable),
INFO_ERROR_TITLE.get());
cancelButton.setEnabled(true);
okButton.setEnabled(true);
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index 86b830a..9593217 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
@@ -68,6 +68,7 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This class is a dialog that appears when the user wants to configure
@@ -690,7 +691,7 @@
// Bug
throwable.printStackTrace();
displayError(
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable),
+ getThrowableMsg(INFO_BUG_MSG.get(), throwable),
INFO_ERROR_TITLE.get());
cancelButton.setEnabled(true);
okButton.setEnabled(true);
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 1b5b5bd..f844ca9 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -54,6 +54,7 @@
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This is an implementation of the Installer class that is used to install
@@ -323,7 +324,7 @@
setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
ApplicationException ex = new ApplicationException(
ReturnCode.BUG,
- Utils.getThrowableMsg(INFO_BUG_MSG.get(), t), t);
+ getThrowableMsg(INFO_BUG_MSG.get(), t), t);
LocalizableMessage msg = getFormattedError(ex, true);
notifyListeners(msg);
logger.error(LocalizableMessage.raw("Error installing.", t));
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index 3edef2a..3fd5ade 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -42,6 +42,7 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isMacOS;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import javax.swing.*;
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 fbf8d1e..5292ff7 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
@@ -30,6 +30,7 @@
import static org.opends.quicksetup.util.Utils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 7b2f69f..670f911 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -31,6 +31,8 @@
import static org.opends.server.util.DynamicConstants.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import static com.forgerock.opendj.util.OperatingSystem.isUnix;
+import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import java.io.*;
import java.net.InetAddress;
@@ -53,7 +55,6 @@
import org.opends.admin.ads.util.ConnectionUtils;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
-import org.forgerock.i18n.LocalizableMessageDescriptor;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.*;
import org.opends.quicksetup.installer.AuthenticationData;
@@ -601,33 +602,6 @@
}
/**
- * Returns a localized message for a given properties key an throwable.
- * @param message prefix
- * @param t the throwable for which we want to get a message.
- *
- * @return a localized message for a given properties key and throwable.
- */
- public static LocalizableMessage getThrowableMsg(LocalizableMessage message, Throwable t)
- {
- LocalizableMessageBuilder mb = new LocalizableMessageBuilder(message);
- LocalizableMessageDescriptor.Arg1<Object> tag;
- if (isOutOfMemory(t))
- {
- tag = INFO_EXCEPTION_OUT_OF_MEMORY_DETAILS;
- }
- else
- {
- tag = INFO_EXCEPTION_DETAILS;
- }
- String detail = t.toString();
- if (detail != null)
- {
- mb.append(" ").append(tag.get(detail));
- }
- return mb.toMessage();
- }
-
- /**
* Gets a localized representation of the provide TopologyCacheException.
* @param te the exception.
* @return a localized representation of the provide TopologyCacheException.
@@ -1082,35 +1056,6 @@
}
/**
- * Tells whether this throwable has been generated for an out of memory
- * error or not.
- * @param t the throwable to analyze.
- * @return <CODE>true</CODE> if the throwable was generated by an out of
- * memory error and false otherwise.
- */
- private static boolean isOutOfMemory(Throwable t)
- {
- boolean isOutOfMemory = false;
- while (!isOutOfMemory && (t != null))
- {
- if (t instanceof OutOfMemoryError)
- {
- isOutOfMemory = true;
- }
- else if (t instanceof IOException)
- {
- String msg = t.toString();
- if (msg != null)
- {
- isOutOfMemory = msg.contains("Not enough space");
- }
- }
- t = t.getCause();
- }
- return isOutOfMemory;
- }
-
- /**
* Returns the number of entries contained in the zip file. This is used to
* update properly the progress bar ratio.
* @return the number of entries contained in the zip file.
@@ -1811,7 +1756,6 @@
//Chars that require special treatment when passing them to command-line.
private final static char[] charsToEscape = {' ', '\t', '\n', '|', ';', '<',
'>', '(', ')', '$', '`', '\\', '"', '\''};
- private static final String OBFUSCATED_VALUE = "******";
/**
* This method simply takes a value and tries to transform it (with escape or
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
index 9c0930a..8268efe 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -27,22 +27,26 @@
package org.opends.quicksetup.util;
-import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isUnix;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
-import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.Application;
-import org.opends.quicksetup.ReturnCode;
-
-import java.io.*;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipEntry;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.quicksetup.Application;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.ReturnCode;
/**
* Class for extracting the contents of a zip file and managing
@@ -211,7 +215,7 @@
} catch (IOException ioe) {
LocalizableMessage errorMsg =
- Utils.getThrowableMsg(
+ getThrowableMsg(
INFO_ERROR_COPYING.get(entry.getName()), ioe);
throw new ApplicationException(
@@ -248,7 +252,7 @@
} catch (IOException ioe) {
LocalizableMessage errorMsg =
- Utils.getThrowableMsg(
+ getThrowableMsg(
INFO_ERROR_ZIP_STREAM.get(zipFileName), ioe);
throw new ApplicationException(
ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
index d9128be..793a122 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
@@ -49,6 +49,7 @@
import static org.opends.quicksetup.util.Utils.*;
import static org.opends.messages.QuickSetupMessages.*;
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
/**
* This class is used to download the files that have been marked as lazy
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 395d5b2..0a01242 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
@@ -80,6 +80,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This program provides a utility that may be used to back up a Directory
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 c746c9a..815f9e5 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
@@ -64,11 +64,11 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.NullOutputStream;
import org.opends.server.util.LDIFReader;
-import org.opends.server.util.SetupUtils;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CliConstants;
import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
@@ -83,6 +83,7 @@
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a very basic tool that can be used to configure some of
@@ -281,7 +282,7 @@
argParser.addArgument(enableStartTLS);
jmxPort = new IntegerArgument("jmxport", 'x', "jmxPort", false, false,
- true, INFO_JMXPORT_PLACEHOLDER.get(), SetupUtils.getDefaultJMXPort(),
+ true, INFO_JMXPORT_PLACEHOLDER.get(), CliConstants.DEFAULT_JMX_PORT,
null, true, 1,
true, 65535,
INFO_CONFIGDS_DESCRIPTION_JMX_PORT.get());
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 8b69608..c0a8252 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
@@ -41,9 +41,9 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.util.OperatingSystem.hasUAC;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* 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 a9811dd..bd2d77d 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
@@ -31,6 +31,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.BackendCfg;
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 3d45155..8cf2f5b 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
@@ -73,6 +73,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This program provides a utility that may be used to interact with the
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 0aaead4..75f630c 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
@@ -40,6 +40,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import static org.opends.server.config.ConfigConstants.*;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
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 b34b4bf..5e9a06f 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
@@ -37,6 +37,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import java.io.File;
import java.io.OutputStream;
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 cf5a12d..8926b3b 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
@@ -42,12 +42,12 @@
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.util.Utils;
import org.opends.server.admin.AdministrationConnector;
-import org.opends.server.util.SetupUtils;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CliConstants;
import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
@@ -236,7 +236,7 @@
jmxPortArg = new IntegerArgument(
"jmxPort".toLowerCase(), 'x', "jmxPort", false, false,
true, INFO_JMXPORT_PLACEHOLDER.get(),
- SetupUtils.getDefaultJMXPort(), "jmxPort", true,
+ CliConstants.DEFAULT_JMX_PORT, "jmxPort", true,
1, true, 65535,
INFO_INSTALLDS_DESCRIPTION_JMXPORT.get());
addArgument(jmxPortArg);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
index 105628c..d3d9da0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
@@ -27,23 +27,33 @@
package org.opends.server.tools;
-import java.io.*;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
+import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static org.opends.server.util.ServerConstants.EOL;
+import static org.opends.messages.ToolMessages.*;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Properties;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.ToolMessages;
import org.opends.quicksetup.Constants;
-import org.opends.quicksetup.util.Utils;
import org.opends.server.loggers.JDKLogging;
import org.opends.server.types.NullOutputStream;
import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.ArgumentException;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
/**
* This class is used to update the scripts that are used to launch the command
@@ -324,7 +334,7 @@
}
catch (IOException ioe)
{
- println(Utils.getThrowableMsg(
+ println(getThrowableMsg(
ERR_JAVAPROPERTIES_WRITING_DESTINATION_FILE.get(destinationFile),
ioe));
return ErrorReturnCode.ERROR_WRITING_FILE.getReturnCode();
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 773e5f9..f6f58be 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
@@ -67,9 +67,9 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.args.LDAPConnectionArgumentParser.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a tool that can be used to issue compare requests to the
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 41d5d67..2d002b2 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
@@ -63,10 +63,10 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.args.LDAPConnectionArgumentParser.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a tool that can be used to issue delete requests to the
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 4816da0..45c5ab4 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
@@ -80,9 +80,9 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.args.LDAPConnectionArgumentParser.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a tool that can be used to issue modify requests to the
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 e8054d8..d72d87c 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
@@ -65,6 +65,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This program provides a utility that uses the LDAP password modify extended
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 0f92890..4e3971d 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
@@ -62,6 +62,7 @@
import static org.opends.server.util.StaticUtils.*;
import static org.opends.server.util.args.LDAPConnectionArgumentParser.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a tool that can be used to issue search requests to the
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 bb9c220..4cb3db6 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
@@ -71,7 +71,7 @@
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
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 5046c44..6874800 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
@@ -77,6 +77,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a program that may be used to apply a set of changes (in
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 9768a4d..4d6b67d 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
@@ -54,6 +54,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class provides a program that may be used to search LDIF files. It is
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 b2fd723..964dc15 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
@@ -66,6 +66,7 @@
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
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 cd3224a..921143a 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
@@ -71,6 +71,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
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 8028411..c6c3a10 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
@@ -69,8 +69,8 @@
import java.util.TreeMap;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.filterExitCode;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* Tool for getting information and managing tasks in the Directory Server.
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
index 28e3b8c..30b0839 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
@@ -34,6 +34,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.StaticUtils;
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 4d2af60..2159e0a 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
@@ -69,6 +69,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static org.opends.server.config.ConfigConstants.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
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/StartWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
index d1d636b..e2654bc 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StartWindowsService.java
@@ -35,8 +35,8 @@
import org.opends.server.types.NullOutputStream;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.util.OperatingSystem.hasUAC;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class is used to start the Windows service associated with this
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 c2f1d7d..744e623 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
@@ -75,6 +75,7 @@
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* 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/StopWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
index 51a9257..8d2ba66 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopWindowsService.java
@@ -35,8 +35,8 @@
import org.opends.server.types.NullOutputStream;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.util.OperatingSystem.hasUAC;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
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 472cd27..5a632c4 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
@@ -33,6 +33,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import java.io.OutputStream;
import java.io.PrintStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
index a461755..4b1cde2 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
@@ -38,6 +38,7 @@
import static org.opends.messages.CoreMessages.*;
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This program provides a simple tool that will wait for a specified file to be
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 4784af1..2e609d7 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
@@ -142,7 +142,7 @@
import static org.opends.messages.ToolMessages.INFO_TASK_TOOL_TASK_SCHEDULED_FUTURE;
import static org.opends.messages.ToolMessages.INFO_TASK_TOOL_RECURRING_TASK_SCHEDULED;
import static org.opends.quicksetup.util.Utils.getFirstValue;
-import static org.opends.quicksetup.util.Utils.getThrowableMsg;
+import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
import static org.opends.server.tools.dsreplication.ReplicationCliReturnCode.*;
import static org.opends.server.util.StaticUtils.*;
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 9f83271..eb86e29 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
@@ -55,6 +55,7 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.Utils.wrapText;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
/**
* This class defines a program that can be used to generate LDIF content based
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 65518d9..d65e1cc 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,7 +26,7 @@
package org.opends.server.tools.upgrade;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.filterExitCode;
+import static com.forgerock.opendj.cli.Utils.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;
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/SetupUtils.java b/opendj3-server-dev/src/server/org/opends/server/util/SetupUtils.java
index 6d04e50..97cabed 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/SetupUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/SetupUtils.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.util;
+import static org.forgerock.util.Utils.closeSilently;
+
import java.io.*;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
@@ -351,15 +353,6 @@
}
/**
- * Returns the default value for the JMX Port.
- * @return the default value for the JMX Port.
- */
- public static int getDefaultJMXPort()
- {
- return 1689;
- }
-
- /**
* Indicates whether we are in a web start installation or not.
*
* @return <CODE>true</CODE> if we are in a web start installation and
@@ -442,7 +435,7 @@
}
finally
{
- close(outputStream);
+ closeSilently(outputStream);
}
}
@@ -475,7 +468,7 @@
}
finally
{
- close(outputStream);
+ closeSilently(outputStream);
}
}
@@ -559,7 +552,7 @@
}
finally
{
- close(br);
+ closeSilently(br);
}
if (hostName == null)
{
@@ -571,19 +564,4 @@
}
return hostName;
}
-
- private static void close(Closeable toClose)
- {
- if (toClose != null)
- {
- try
- {
- toClose.close();
- }
- catch (Exception e)
- {
- // ignore
- }
- }
- }
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
index 687d098..97e619d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/StaticUtils.java
@@ -3746,35 +3746,6 @@
}
/**
- * Filters the provided value to ensure that it is appropriate for use as an
- * exit code. Exit code values are generally only allowed to be between 0 and
- * 255, so any value outside of this range will be converted to 255, which is
- * the typical exit code used to indicate an overflow value.
- *
- * @param exitCode The exit code value to be processed.
- *
- * @return An integer value between 0 and 255, inclusive. If the provided
- * exit code was already between 0 and 255, then the original value
- * will be returned. If the provided value was out of this range,
- * then 255 will be returned.
- */
- public static int filterExitCode(int exitCode)
- {
- if (exitCode < 0)
- {
- return 255;
- }
- else if (exitCode > 255)
- {
- return 255;
- }
- else
- {
- return exitCode;
- }
- }
-
- /**
* Checks that no more that one of a set of arguments is present. This
* utility should be used after argument parser has parsed a set of
* arguments.
--
Gitblit v1.10.0