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/installer/InstallerHelper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 4a4fe4a..9d6d03a 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -69,6 +69,7 @@
import org.opends.messages.ReplicationMessages;
import static org.opends.messages.QuickSetupMessages.*;
+import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import org.opends.server.tools.ConfigureDS;
import org.opends.server.tools.ConfigureWindowsService;
@@ -86,7 +87,7 @@
/**
* This is the only class that uses classes in org.opends.server (excluding the
- * case of DynamicConstants, SetupUtils, OperatingSystem and CertificateManager
+ * case of DynamicConstants, SetupUtils and CertificateManager
* which are already included in quicksetup.jar).
*
* Important note: do not include references to this class until OpenDS.jar has
@@ -126,7 +127,7 @@
File installPath = new File(application.getInstallationPath());
ArrayList<String> argList = new ArrayList<String>();
File binPath;
- if (Utils.isWindows())
+ if (isWindows())
{
binPath =
new File(installPath, Installation.WINDOWS_BINARIES_PATH_RELATIVE);
@@ -136,7 +137,7 @@
new File(installPath, Installation.UNIX_BINARIES_PATH_RELATIVE);
}
File importPath;
- if (Utils.isWindows())
+ if (isWindows())
{
importPath = new File(binPath, Installation.WINDOWS_IMPORT_LDIF);
} else
@@ -1159,7 +1160,7 @@
{
fLib.mkdir();
}
- if (Utils.isWindows())
+ if (isWindows())
{
destinationFile = Utils.getPath(libDir,
Installation.SET_JAVA_PROPERTIES_FILE_WINDOWS);
--
Gitblit v1.10.0