From 4e4b322332130bf466e3bdbd9cd7c4ca832d1049 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Jul 2015 13:29:00 +0000
Subject: [PATCH] OPENDJ-2027 (CR-7617) Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java
index 8c556d2..a6789c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java
@@ -32,6 +32,8 @@
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
+import static com.forgerock.opendj.cli.Utils.*;
+
import java.io.File;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -103,15 +105,15 @@
if (! OperatingSystem.isUnixBased())
{
- err.println(ERR_CREATERC_ONLY_RUNS_ON_UNIX.get());
+ printWrappedText(err, ERR_CREATERC_ONLY_RUNS_ON_UNIX.get());
return 1;
}
File serverRoot = DirectoryServer.getEnvironmentConfig().getServerRoot();
if (serverRoot == null)
{
- err.println(ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(
- PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT));
+ printWrappedText(
+ err, ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT));
return 1;
}
@@ -164,7 +166,7 @@
}
catch (ArgumentException ae)
{
- err.println(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
return 1;
}
@@ -174,7 +176,8 @@
}
catch (ArgumentException ae)
{
- err.println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
+ err.println(argParser.getUsage());
return 1;
}
@@ -190,7 +193,7 @@
File f = new File(javaHome.getValue());
if (!f.exists() || !f.isDirectory())
{
- err.println(ERR_CREATERC_JAVA_HOME_DOESNT_EXIST.get(javaHome.getValue()));
+ printWrappedText(err, ERR_CREATERC_JAVA_HOME_DOESNT_EXIST.get(javaHome.getValue()));
return 1;
}
@@ -299,7 +302,7 @@
}
catch (Exception e)
{
- err.println(ERR_CREATERC_CANNOT_WRITE.get(getExceptionMessage(e)));
+ printWrappedText(err, ERR_CREATERC_CANNOT_WRITE.get(getExceptionMessage(e)));
return 1;
}
--
Gitblit v1.10.0