From a4836cb338da19b834b1e6a31a70453b24427c08 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Nov 2014 16:27:57 +0000
Subject: [PATCH] OPENDJ-1635 SNMP: fail to get dsServerDescription value
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java | 4 +++-
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java | 5 +++--
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 6 ++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index e66abf1..de5365e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -134,6 +134,7 @@
import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.messages.AdminToolMessages.*;
+import static org.opends.quicksetup.Installation.*;
import static org.opends.server.types.CommonSchemaElements.*;
/**
@@ -1918,8 +1919,9 @@
{
for (String classPath : classPaths)
{
- String normPath = classPath.replace(File.separatorChar, '/');
- if (normPath.endsWith(Installation.OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH))
+ final String normPath = classPath.replace(File.separatorChar, '/');
+ if (normPath.endsWith(OPENDJ_BOOTSTRAP_CLIENT_JAR_RELATIVE_PATH)
+ || normPath.endsWith(OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH))
{
return classPath;
}
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java
index 20434a0..87894b6 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -54,8 +54,9 @@
{
/** Relative path to bootstrap OpenDJ jar file. */
- public static final String OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH =
- "lib/bootstrap-client.jar";
+ public static final String OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH = "lib/bootstrap.jar";
+ /** Relative path to bootstrap-client OpenDJ jar file. */
+ public static final String OPENDJ_BOOTSTRAP_CLIENT_JAR_RELATIVE_PATH = "lib/bootstrap-client.jar";
/**
* The relative path where all the Windows binaries (batch files) are.
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 98a3eb8..e6f18d5 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -66,6 +66,7 @@
import static org.forgerock.util.Utils.*;
import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.quicksetup.Installation.*;
import static org.opends.server.util.DynamicConstants.*;
/**
@@ -831,7 +832,8 @@
for (String classPath : classPaths)
{
final String normPath = classPath.replace(File.separatorChar, '/');
- if (normPath.endsWith(Installation.OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH))
+ if (normPath.endsWith(OPENDJ_BOOTSTRAP_CLIENT_JAR_RELATIVE_PATH)
+ || normPath.endsWith(OPENDJ_BOOTSTRAP_JAR_RELATIVE_PATH))
{
return classPath;
}
--
Gitblit v1.10.0