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/server/org/opends/server/tools/InstallDS.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
index 9b2c091..45a00be 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
@@ -34,6 +34,7 @@
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
import static com.forgerock.opendj.cli.Utils.canWrite;
import static org.forgerock.util.Utils.joinAsString;
+import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import java.io.BufferedReader;
import java.io.File;
@@ -575,7 +576,7 @@
// Use this instead a call to Installation to avoid to launch a new JVM
// just to retrieve a path.
String root = Utils.getInstallPathFromClasspath();
- if (SetupUtils.isWindows())
+ if (isWindows())
{
String binDir = Utils.getPath(root,
Installation.WINDOWS_BINARIES_PATH_RELATIVE);
@@ -1809,7 +1810,7 @@
{
boolean enableService = false;
// If we are in Windows ask if the server must run as a windows service.
- if (SetupUtils.isWindows())
+ if (isWindows())
{
if (argParser.enableWindowsServiceArg.isPresent())
{
@@ -2481,7 +2482,7 @@
println(INFO_INSTALLDS_DO_NOT_START_SERVER.get());
}
- if (Utils.isWindows())
+ if (isWindows())
{
if (uData.getEnableWindowsService())
{
--
Gitblit v1.10.0