mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

jvergara
28.50.2007 69287099bab9640465cb18ef4006252d05a33e5d
refs
author jvergara <jvergara@localhost>
Friday, September 28, 2007 21:50 +0200
committer jvergara <jvergara@localhost>
Friday, September 28, 2007 21:50 +0200
commit69287099bab9640465cb18ef4006252d05a33e5d
tree b66668f7570461bbac87199fb56757c8597634d2 tree | zip | gz
parent d30d857423de7afd4c96919232af420739cede6f view | diff
Fix for issue 2035 (Use OpenDS specific environment variables to determine the JVM to be used.)

Use two environment variables to know which is the JVM to be used by the scripts: OPENDS_JAVA_BIN and OPENDS_JAVA_HOME.

When the setup creates the file lib/set-java-home it writes the contents of OPENDS_JAVA_HOME to it (instead of JAVA_HOME which was the previous behavior).

Before these changes, the scripts used to look for JAVA_BIN, then JAVA_HOME and finally for the contents of the set-java-home file. The problem with this approach is that if the user required to specify JAVA_HOME or JAVA_BIN to an unsupported version of the JDK (because some other program in the machine had this requirement) the scripts of OpenDS could not run. Now the checks that we do to figure out the JVM are done in the following order:
1. Check if OPENDS_JAVA_BIN is defined in the environment.
2. Check if OPENDS_JAVA_HOME is defined in the environment.
3. Check if OPENDS_JAVA_HOME is defined in the lib/set-java-home file.
4. Check if JAVA_BIN is defined in the environment.
5. Check if JAVA_HOME is defined in the environment.
6. Check if we can figure out the java installation by executing "type java" (in UNIX environments).

If any of the above checks is positive, we will try to use the JVM found.

Extras: the uninstall script on UNIX now checks that we are using a JDK compatible with 1.5 and displays a user friendly message if it does not.


25 files modified
958 ■■■■■ changed files
opends/resource/bin/_client-script.bat 38 ●●●●● diff | view | raw | blame | history
opends/resource/bin/_client-script.sh 41 ●●●●● diff | view | raw | blame | history
opends/resource/bin/_server-script.bat 38 ●●●●● diff | view | raw | blame | history
opends/resource/bin/_server-script.sh 40 ●●●●● diff | view | raw | blame | history
opends/resource/bin/start-ds 62 ●●●●● diff | view | raw | blame | history
opends/resource/bin/start-ds.bat 59 ●●●●● diff | view | raw | blame | history
opends/resource/bin/status-panel.bat 52 ●●●● diff | view | raw | blame | history
opends/resource/bin/stop-ds 50 ●●●●● diff | view | raw | blame | history
opends/resource/bin/stop-ds.bat 51 ●●●●● diff | view | raw | blame | history
opends/resource/setup 79 ●●●●● diff | view | raw | blame | history
opends/resource/setup.bat 61 ●●●●● diff | view | raw | blame | history
opends/resource/uninstall 118 ●●●●● diff | view | raw | blame | history
opends/resource/uninstall.bat 42 ●●●●● diff | view | raw | blame | history
opends/resource/upgrade 85 ●●●●● diff | view | raw | blame | history
opends/resource/upgrade.bat 46 ●●●●● diff | view | raw | blame | history
opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java 14 ●●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java 7 ●●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java 8 ●●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java 2 ●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java 2 ●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java 8 ●●●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java 8 ●●●●● diff | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java 13 ●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/tools/CreateRCScript.java 11 ●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/util/SetupUtils.java 23 ●●●●● diff | view | raw | blame | history