completed migration of code to use Installer constants and methods for file...

kenneth_suter

07.06.2007 e08ee9a21301e4607806ff0230eca74d6dc3b13b

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java

@@ -30,6 +30,7 @@

import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.util.Utils;

/**
@@ -114,9 +115,9 @@
  public void printUsage() {
    String arg;
    if (Utils.isWindows()) {
      arg = Utils.getWindowsSetupFileName();
      arg = Installation.WINDOWS_SETUP_FILE_NAME;
    } else {
      arg = Utils.getUnixSetupFileName();
      arg = Installation.UNIX_SETUP_FILE_NAME;
    }
    /*
     * This is required because the usage message contains '{' characters that
@@ -154,10 +155,10 @@

    if (Utils.isWindows()) {
      System.setProperty("org.opends.server.scriptName",
              Utils.getWindowsSetupFileName());
              Installation.WINDOWS_SETUP_FILE_NAME);
    } else {
      System.setProperty("org.opends.server.scriptName",
              Utils.getUnixSetupFileName());
              Installation.UNIX_SETUP_FILE_NAME);
    }
    ArrayList<String> newArgList = new ArrayList<String>();
    if (args != null) {
@@ -170,7 +171,9 @@
    newArgList.add("--configClass");
    newArgList.add("org.opends.server.extensions.ConfigFileHandler");
    newArgList.add("--configFile");
    newArgList.add(Utils.getConfigFileFromClasspath());
    Installation installation =
            new Installation(Utils.getInstallPathFromClasspath());
    newArgList.add(Utils.getPath(installation.getCurrentConfigurationFile()));

    String[] newArgs = new String[newArgList.size()];
    newArgList.toArray(newArgs);