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

Gaetan Boismal
08.25.2016 8bf05d16714ec5ec23bec6d169b4b8201c463ce4
refs
author Gaetan Boismal <gaetan.boismal@forgerock.com>
Tuesday, November 8, 2016 11:25 +0100
committer Gaetan Boismal <gaetan.boismal@forgerock.com>
Monday, November 28, 2016 16:37 +0100
commit8bf05d16714ec5ec23bec6d169b4b8201c463ce4
tree 1a8a548b7df96c0affb53cecffb48477870cc5eb tree | zip | gz
parent 356fb0aa8e4afbc8615a29b48082340905781268 view | diff
OPENDJ-3527 OPENDJ-3531 OPENDJ-1633 Fix tools bootstrap

Cleanup in the way we mange to compute OPENDJ_JAVA_BIN and OPENDJ_JAVA_ARGS environment variable for our tools.

Removes lib/set-java-home and lib\set-java-home.bat
Now lib/_script_util[.sh | .bat] use the following order to determine java home:
* Use OPENDJ_JAVA_BIN if exists and points to an existing file
* Use OPENDJ_JAVA_HOME if exists and OPENDJ_JAVA_HOME/bin/java[.exe] is an existing file
* **NEW** read the property 'SCRIPT_NAME.java-home' in config/java.properties file and uses it if the PROPERTY_VALUE/bin/java[.exe] is an existing file
* **NEW** read the property 'default.java-home' in config/java.properties file and uses it if the PROPERTY_VALUE/bin/java[.exe] is an existing file
* Otherwise try to call java command as before
* If no java has been found, prints an error message (which has been adapted by this change)

Replaces the 'Java Settings' panel by a message which indicates to the user that he have to modify the java.properties file to update runtime settings.
Removes the dsjavaproperties tool since it is now useless
Also fix OPENDJ-3531 by removing support of OPENDS_JAVA_* legacy environment variables
Also fix OPENDJ-1633 by adding an explicit --offline arguments to all server tools which have offline mode.
4 files deleted
34 files modified
4300 ■■■■ changed files
opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties 3 ●●●● diff | view | raw | blame | history
opendj-doc-generated-ref/pom.xml 10 ●●●●● diff | view | raw | blame | history
opendj-doc-generated-ref/src/main/docbkx/man-pages/index.xml 5 ●●●● diff | view | raw | blame | history
opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java 11 ●●●●● diff | view | raw | blame | history
opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat 281 ●●●● diff | view | raw | blame | history
opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh 5 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/_mixed-script.bat 151 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/_mixed-script.sh 69 ●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/_script-util.bat 466 ●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/_script-util.sh 207 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/dsjavaproperties 27 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/dsjavaproperties.bat 22 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/bin/stop-ds.bat 264 ●●●● diff | view | raw | blame | history
opendj-server-legacy/resource/config/java.properties 22 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java 1360 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java 3 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallerHelper.java 10 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java 3 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java 2 ●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java 1019 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesToolArgumentParser.java 201 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java 2 ●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java 43 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java 8 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java 37 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java 12 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties 2 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool.properties 3 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties 1 ●●●● diff | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/tools/ArgumentParserToolsTestCase.java 6 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/tools/ImportLDIFTestCase.java 30 ●●●●● diff | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/tools/RebuildIndexTestCase.java 9 ●●●●● diff | view | raw | blame | history