Revert the changes made in revision 2281 for issue #1865 because they have ...

neil_a_wilson

07.36.2007 5f8b6b9c154ee7af10e5b3db6228fc3bfe905949

Revert the changes made in revision 2281 for issue #1865 because they have
broken the graphical setup utility.  With the changes committed in revision
2281, the setup dialog exits immediately with no error, most likely because of
the introduction of a new System.exit calls.

 opends/resource/upgrade

@@ -136,8 +136,7 @@
done
export CLASSPATH
"${JAVA_BIN}" org.opends.quicksetup.upgrader.BuildExtractor "${@}"
RETURN_CODE=$?
if test ${RETURN_CODE} -eq 0
if test $? -eq 0
then
  # Configure the appropriate CLASSPATH.
  # Unlike BuildExtractor, the Upgrader uses
@@ -149,10 +148,6 @@
  done
  # Launch the upgrade process.
  "${JAVA_BIN}" org.opends.quicksetup.upgrader.UpgradeLauncher "${@}"
elif test ${RETURN_CODE} -eq 50
then
  # Version info was on requested
  exit 0
else
  exit 101
fi

 opends/resource/upgrade.bat

@@ -70,7 +70,6 @@
FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
set CLASSPATH=%DIR_HOME%\classes;%CLASSPATH%
"%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
if %errorlevel% == 50 goto version
if not %errorlevel% == 0 goto end
goto upgrader

@@ -80,8 +79,4 @@
"%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
goto end

:version
rem version information was requested. Return code should be 0.
exit /B 0

:end

 opends/src/quicksetup/org/opends/quicksetup/Launcher.java

@@ -305,23 +305,21 @@

  /**
   * The main method which is called by the command lines.
   *
   * @return the error return code.
   */
  public int launch() {
  public void launch() {
    if (shouldPrintVersion())
    {
      printVersion();
      return QuickSetupCli.VERSION_PRINT;
      System.exit(QuickSetupCli.SUCCESSFUL);
    }
    else if (shouldPrintUsage()) {
      printUsage(false);
      return QuickSetupCli.SUCCESSFUL;
      System.exit(QuickSetupCli.SUCCESSFUL);
    } else if (isCli()) {
      CliApplication cliApp = createCliApplication();
      int exitCode = launchCli(args, cliApp);
      preExit(cliApp);
      return exitCode;
      System.exit(exitCode);
    } else {
      willLaunchGui();
      int exitCode = launchGui(args);
@@ -339,19 +337,12 @@
        exitCode = launchCli(args, cliApp);
        if (exitCode != 0) {
          preExit(cliApp);
          return exitCode;
          System.exit(exitCode);
        }
      }
      else
      {
        return exitCode ;
      }
    }

    // We should never reach this code
    return QuickSetupCli.UNKNOWN;
  }

  private void preExit(CliApplication cliApp) {
    if (cliApp != null) {
      UserData ud = cliApp.getUserData();

 opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java

@@ -70,11 +70,6 @@
  static public int BUG = 5;

  /**
   * Return code: It's not an error. Version info.
   */
  static public int VERSION_PRINT = 50;

  /**
   * Return code for errors that are non-specified.
   */
  static public int UNKNOWN = 100;

 opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java

@@ -36,7 +36,6 @@
import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.QuickSetupCli;
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.ServerConstants;
@@ -80,16 +79,7 @@
      System.err.println("Unable to initialize log");
      t.printStackTrace();
    }
    Launcher launcher = new InstallLauncher(args);
    int returnCode = launcher.launch();
    if (returnCode == QuickSetupCli.VERSION_PRINT)
    {
      System.exit(QuickSetupCli.SUCCESSFUL);
    }
    else
    {
      System.exit(returnCode);
    }
    new InstallLauncher(args).launch();
  }

  /**

 opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java

@@ -36,7 +36,6 @@
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.QuickSetupCli;
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.ServerConstants;
@@ -75,16 +74,7 @@
      System.err.println("Unable to initialize log");
      t.printStackTrace();
    }
    Launcher launcher = new UninstallLauncher(args);
    int returnCode = launcher.launch();
    if (returnCode == QuickSetupCli.VERSION_PRINT)
    {
      System.exit(QuickSetupCli.SUCCESSFUL);
    }
    else
    {
      System.exit(returnCode);
    }
    new UninstallLauncher(args).launch();
  }

  /**

 opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java

@@ -72,9 +72,7 @@
              ResourceProvider.getInstance().getMsg("error-initializing-log"));
      t.printStackTrace();
    }
    Launcher launcher = new BuildExtractor(args);
    int returnCode = launcher.launch();
    System.exit(returnCode);
    new BuildExtractor(args).launch();
  }

  private BuildExtractorCliHelper helper = new BuildExtractorCliHelper();

 opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java

@@ -33,7 +33,6 @@
import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.QuickSetupCli;
import org.opends.quicksetup.QuickSetupLog;
import org.opends.quicksetup.i18n.ResourceProvider;
import org.opends.quicksetup.util.Utils;
@@ -74,16 +73,7 @@
              ResourceProvider.getInstance().getMsg("error-initializing-log"));
      t.printStackTrace();
    }
    Launcher launcher = new UpgradeLauncher(args);
    int returnCode = launcher.launch();
    if (returnCode == QuickSetupCli.VERSION_PRINT)
    {
      System.exit(QuickSetupCli.SUCCESSFUL);
    }
    else
    {
      System.exit(returnCode);
    }
    new UpgradeLauncher(args).launch();
  }

  /**