From afa089fedd62a29826d57cc34293ad5e0e6a4efd Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 26 Mar 2014 13:15:01 +0000
Subject: [PATCH] Replaced OperatingSystem class by its SDK class.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 60 ++++++++++--------------------------------------------------
1 files changed, 10 insertions(+), 50 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 2f29478..94798ac 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -29,6 +29,8 @@
import static org.forgerock.util.Utils.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.server.util.DynamicConstants.*;
+import static com.forgerock.opendj.util.OperatingSystem.isWindows;
+import static com.forgerock.opendj.util.OperatingSystem.isUnix;
import java.io.*;
import java.net.InetAddress;
@@ -139,7 +141,7 @@
String script;
String libPath = Utils.getPath(installPath,
Installation.LIBRARIES_PATH_RELATIVE);
- if (Utils.isWindows())
+ if (isWindows())
{
script = Utils.getScriptPath(Utils.getPath(libPath,
Installation.SCRIPT_UTIL_FILE_WINDOWS));
@@ -158,7 +160,7 @@
env.remove("OPENDJ_JAVA_BIN");
// In windows by default the scripts ask the user to click on enter when
// they fail. Set this environment variable to avoid it.
- if (Utils.isWindows())
+ if (isWindows())
{
env.put("DO_NOT_PAUSE", "true");
}
@@ -172,7 +174,7 @@
logger.info(LocalizableMessage.raw("The output: "+line));
if (line.contains("ERROR: The detected Java version"))
{
- if (Utils.isWindows())
+ if (isWindows())
{
// If we are running windows, the process get blocked waiting for
// user input. Just wait for a certain time to print the output
@@ -308,48 +310,6 @@
}
/**
- * Returns <CODE>true</CODE> if we are running under windows and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we are running under windows and
- * <CODE>false</CODE> otherwise.
- */
- public static boolean isWindows()
- {
- return SetupUtils.isWindows();
- }
-
- /**
- * Returns <CODE>true</CODE> if we are running under Mac OS and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we are running under Mac OS and
- * <CODE>false</CODE> otherwise.
- */
- public static boolean isMacOS()
- {
- return SetupUtils.isMacOS();
- }
-
- /**
- * Returns <CODE>true</CODE> if we are running under Unix and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if we are running under Unix and
- * <CODE>false</CODE> otherwise.
- */
- public static boolean isUnix()
- {
- return SetupUtils.isUnix();
- }
-
- /**
- * Returns a String representation of the OS we are running.
- * @return a String representation of the OS we are running.
- */
- public static String getOSString()
- {
- return SetupUtils.getOSString();
- }
-
- /**
* Returns <CODE>true</CODE> if the parent directory for the provided path
* exists and <CODE>false</CODE> otherwise.
* @param path the path that we are analyzing.
@@ -1472,7 +1432,7 @@
catch (Throwable t)
{
String setupFile;
- if (Utils.isWindows())
+ if (isWindows())
{
setupFile = Installation.WINDOWS_SETUP_FILE_NAME;
}
@@ -1853,7 +1813,7 @@
int initialIndex = 1;
StringBuilder sbSeparator = new StringBuilder();
sbSeparator.append(formatter.getSpace());
- if (!Utils.isWindows())
+ if (!isWindows())
{
sbSeparator.append("\\");
sbSeparator.append(formatter.getLineBreak());
@@ -1896,7 +1856,7 @@
public static String escapeCommandLineValue(String value)
{
StringBuilder b = new StringBuilder();
- if (Utils.isUnix())
+ if (isUnix())
{
for (int i=0 ; i<value.length(); i++)
{
@@ -1934,7 +1894,7 @@
{
ArrayList<String> cmdLine = new ArrayList<String>();
String setupFile;
- if (Utils.isWindows())
+ if (isWindows())
{
setupFile = Installation.WINDOWS_SETUP_FILE_NAME;
}
@@ -1996,7 +1956,7 @@
cmdLine.add("--rootUserPassword");
cmdLine.add(OBFUSCATED_VALUE);
- if (Utils.isWindows() && userData.getEnableWindowsService())
+ if (isWindows() && userData.getEnableWindowsService())
{
cmdLine.add("--enableWindowsService");
}
--
Gitblit v1.10.0