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

Jean-Noel Rouvignac
18.27.2014 9a823550e43dd9395b2a2681947e29a2086ad620
refs
author Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Tuesday, November 18, 2014 17:27 +0100
committer Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Tuesday, November 18, 2014 17:27 +0100
commit9a823550e43dd9395b2a2681947e29a2086ad620
tree da44649afaf4224dcb647d7e8a812650cf05a86d tree | zip | gz
parent fe76e8a19b44806697b54c498ae93319673aa523 view | diff
OPENDJ-1635 SNMP: fail to get dsServerDescription value

SNMP's dsServerDescription determines the install path from the location of bootstrap-client.jar, extracted from the class path.
However, start-ds command uses bootstrap.jar in the classpath instead of bootstrap-client.jar (which is for the tools).
The fix consists in verifying the location for both boostrap.jar and boostrap-client.jar in the classpath.


Installation.java:
Changed OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH to refer to bootstrap.jar.
Added OPENDJ_BOOTSTRAP_CLIENT_JAR_RELATIVE_PATH constant.

Utils.java, Utilities.java:
In getInstallPath(), added checks for both OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH and OPENDJ_BOOTSTRAP_CLIENT_JAR_RELATIVE_PATH.
3 files modified
15 ■■■■■ changed files
opendj-sdk/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java 6 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java 5 ●●●●● diff | view | raw | blame | history
opendj-sdk/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java 4 ●●● diff | view | raw | blame | history