From 0fd845d18cfaf23fc9f54e92775c735955e4e859 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 27 Jul 2015 09:02:08 +0000
Subject: [PATCH] OPENDJ-2027 CR-7646 Change tools message on error
---
opendj-server-legacy/src/main/java/org/opends/server/tools/CreateRCScript.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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 a6789c0..83f1787 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
@@ -101,23 +101,12 @@
PrintStream err = NullOutputStream.wrapOrNullStream(errStream);
JDKLogging.disableLogging();
- EmbeddedUtils.initializeForClientUse();
-
if (! OperatingSystem.isUnixBased())
{
printWrappedText(err, ERR_CREATERC_ONLY_RUNS_ON_UNIX.get());
return 1;
}
- File serverRoot = DirectoryServer.getEnvironmentConfig().getServerRoot();
- if (serverRoot == null)
- {
- printWrappedText(
- err, ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT));
- return 1;
- }
-
-
LocalizableMessage description = INFO_CREATERC_TOOL_DESCRIPTION.get();
ArgumentParser argParser =
new ArgumentParser(CreateRCScript.class.getName(), description, false);
@@ -176,8 +165,7 @@
}
catch (ArgumentException ae)
{
- printWrappedText(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
- err.println(argParser.getUsage());
+ argParser.displayMessageAndUsageReference(err, ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
return 1;
}
@@ -186,6 +174,15 @@
return 0;
}
+ EmbeddedUtils.initializeForClientUse();
+ File serverRoot = DirectoryServer.getEnvironmentConfig().getServerRoot();
+ if (serverRoot == null)
+ {
+ printWrappedText(
+ err, ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT));
+ return 1;
+ }
+
// Determine the path to the Java installation that should be used.
String javaHomeDir;
if (javaHome.isPresent())
--
Gitblit v1.10.0