From e08ee9a21301e4607806ff0230eca74d6dc3b13b Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Sat, 07 Apr 2007 00:06:48 +0000
Subject: [PATCH] completed migration of code to use Installer constants and methods for filesystem related tasks
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
index 0ad306d..b134fe3 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetup.java
@@ -361,19 +361,14 @@
public Object processBackgroundTask() throws UserDataException {
try
{
- String cmd = Utils.isWindows()?Utils.getWindowsStatusPanelFileName():
- Utils.getUnixStatusPanelFileName();
- String serverPath;
- if (Utils.isWebStart())
- {
- serverPath = application.getUserData().getServerLocation();
+ String rootDirectory;
+ if (isWebStart()) {
+ rootDirectory = application.getUserData().getServerLocation();
+ } else {
+ rootDirectory = Utils.getInstallPathFromClasspath();
}
- else
- {
- serverPath = Utils.getInstallPathFromClasspath();
- }
- cmd = Utils.getPath(serverPath, Utils.getBinariesRelativePath()+
- File.separator+cmd);
+ Installation installation = new Installation(rootDirectory);
+ String cmd = Utils.getPath(installation.getStatusPanelCommandFile());
ProcessBuilder pb = new ProcessBuilder(cmd);
Map<String, String> env = pb.environment();
env.put("JAVA_HOME", System.getProperty("java.home"));
--
Gitblit v1.10.0