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/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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
{
--
Gitblit v1.10.0