From 81f10e1aaf37482a6907a8b647fa05c2826a1ff7 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 06 Jul 2007 23:36:07 +0000
Subject: [PATCH] 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.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 12 -----
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java | 19 ++-------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java | 12 -----
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java | 5 --
opendj-sdk/opends/resource/upgrade | 7 ---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java | 12 -----
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java | 4 -
opendj-sdk/opends/resource/upgrade.bat | 5 --
8 files changed, 10 insertions(+), 66 deletions(-)
diff --git a/opendj-sdk/opends/resource/upgrade b/opendj-sdk/opends/resource/upgrade
index 90e2792..b2e2857 100644
--- a/opendj-sdk/opends/resource/upgrade
+++ b/opendj-sdk/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
diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 726da68..86fd044 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/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
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
index 599d9fb..589ac57 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opendj-sdk/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,17 +337,10 @@
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) {
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
index f423341..fcb7041 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/QuickSetupCli.java
+++ b/opendj-sdk/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;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
index b31ff8a..dbed47c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
+++ b/opendj-sdk/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();
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
index f49eecd..535f947 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/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();
}
/**
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
index 9bc272f..ffc7b40 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractor.java
+++ b/opendj-sdk/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();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index c420013..0999a2f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/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();
}
/**
--
Gitblit v1.10.0