From 51c03de0d76b7745e41016c3300a149d3976e962 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 07 Nov 2016 10:05:36 +0000
Subject: [PATCH] OPENDJ-3450 Replaces old make-ldif resources by new ones
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 990fc58..6112fc5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -53,6 +53,7 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketAddress;
+import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -394,6 +395,8 @@
// Copy the configuration, schema, and MakeLDIF resources into the
// appropriate place under the test package.
+ File makeLdifResourcesDir = Paths.get(paths.buildRoot, "..", "opendj-core", "src", "main", "resources",
+ "org", "forgerock", "opendj", "ldif").toAbsolutePath().toFile();
File serverClassesDir = new File(paths.buildDir, "classes");
File unitClassesDir = new File(paths.unitRoot, "classes");
File libDir = new File(paths.buildDir.getPath() + "/package/opendj/lib");
@@ -437,7 +440,7 @@
// copy upgrade directory
copyDirectory(upgradeDir, new File(paths.testConfigDir, "upgrade"));
copyDirectory(new File(resourceDir, "schema"), new File(testSchemaDir, "schema"));
- copyDirectory(new File(resourceDir, "MakeLDIF"), new File(paths.testConfigDir, "MakeLDIF"));
+ copyDirectory(makeLdifResourcesDir, new File(paths.testConfigDir, "MakeLDIF"));
copyDirectory(new File(snmpResourceDir, "security"), new File(testSnmpResourceDir, "security"));
copyFileFromTo("server.keystore", testResourceDir, paths.testConfigDir);
copyFileFromTo("server.truststore", testResourceDir, paths.testConfigDir);
--
Gitblit v1.10.0