From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
similarity index 96%
rename from opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java
rename to opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
index dbc2d44..8712cb1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
@@ -24,14 +24,14 @@
*
* Portions Copyright 2006 Sun Microsystems, Inc.
*/
-package org.opends.quicksetup;
+package org.opends.quicksetup.installer;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
+import org.opends.quicksetup.SplashScreen;
import org.opends.quicksetup.i18n.ResourceProvider;
-import org.opends.quicksetup.installer.offline.OfflineInstaller;
import org.opends.quicksetup.util.Utils;
/**
@@ -41,7 +41,7 @@
* based setup much be launched.
*
*/
-public class SetupLauncher
+public class InstallLauncher
{
private static String COMMAND_NAME_WINDOWS = "setup.bat";
@@ -137,6 +137,8 @@
*/
private static int launchCliSetup(String[] args)
{
+ System.setProperty("org.opends.quicksetup.cli", "true");
+
if (Utils.isWindows())
{
System.setProperty("org.opends.server.scriptName",
@@ -160,7 +162,7 @@
newArgList.add("--configClass");
newArgList.add("org.opends.server.extensions.ConfigFileHandler");
newArgList.add("--configFile");
- newArgList.add(OfflineInstaller.CONFIG_FILE_NAME);
+ newArgList.add(Utils.getConfigFileFromClasspath());
String[] newArgs = new String[newArgList.size()];
newArgList.toArray(newArgs);
--
Gitblit v1.10.0