From 73302adac1b5e9aa946418ca776df8be9613ced4 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 07 Feb 2014 10:15:15 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 - Extracted CLI arguments identifiers from CliConstants to ArgumentConstants. - Moved default CLI values like DEFAULT_LDAP_PORT, DEFAULT_ADMIN_PORT to CliConstants. - Code cleanup.
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index bf537fa..c1cbd2e 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -32,6 +32,8 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.StringTokenizer;
import org.forgerock.i18n.LocalizableMessage;
@@ -44,11 +46,6 @@
static public final String LINE_SEPARATOR = System.getProperty("line.separator");
/**
- * The name of a command-line script used to launch a tool.
- */
- public static final String PROPERTY_SCRIPT_NAME = "com.forgerock.opendj.ldap.tools.scriptName";
-
- /**
* The column at which to wrap long lines of output in the command-line
* tools.
*/
@@ -346,6 +343,28 @@
}
}
+ /**
+ * Returns the default host name.
+ *
+ * @return The default host name or empty string if the host name cannot be resolved.
+ */
+ public static String getDefaultHostName() {
+ try {
+ return InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ // Fails.
+ }
+ String host = System.getenv("COMPUTERNAME"); // Windows.
+ if (host != null) {
+ return host;
+ }
+ host = System.getenv("HOSTNAME"); // Unix.
+ if (host != null) {
+ return host;
+ }
+ return "";
+ }
+
// Prevent instantiation.
private Utils() {
// Do nothing.
--
Gitblit v1.10.0