From 1458d2cd509fc0e895fe1a11f9831ea2cb5bab5b Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 15 Jun 2015 08:58:11 +0000
Subject: [PATCH] OPENDJ-1977 Improve setup log
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java | 12 +++++-------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java | 2 --
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
index 57227a1..7fcda78 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
@@ -70,7 +70,6 @@
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.SaltedSHA512PasswordStorageScheme;
-import org.opends.server.loggers.JDKLogging;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryEnvironmentConfig;
@@ -292,7 +291,6 @@
private int run()
{
- JDKLogging.disableLogging();
try
{
initializeArguments();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
index 03b4d67..fcbbadf 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
@@ -26,10 +26,11 @@
*/
package org.opends.server.tools;
-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 static org.opends.server.util.ServerConstants.*;
+
+import static com.forgerock.opendj.cli.Utils.*;
+import static com.forgerock.opendj.util.OperatingSystem.*;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -47,11 +48,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.ToolMessages;
import org.opends.quicksetup.Constants;
-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 com.forgerock.opendj.cli.ConsoleApplication;
/**
@@ -186,8 +186,6 @@
PrintStream err = NullOutputStream.wrapOrNullStream(errStream);
- JDKLogging.disableLogging();
-
JavaPropertiesTool tool = new JavaPropertiesTool(out, err, inStream);
return tool.execute(args);
--
Gitblit v1.10.0