external-software/github_OpenIdentityPlatform_OpenDJ.git

OPENDJ-3450 Replaces old make-ldif resources by new ones

This change should have been done in OPENDJ-2750 where the server's
make-ldif tool has been removed.
Also removes old make-ldif resources and replaces them in the archive by
sdk's makeldif ones.
Adapts "unit"-tests archive creation.
Note that these resources are also embedded in lib/opendj-core.jar but
we have to keep them 'visible' in the archive to keep it user-friendly.
Using correct resources for new makeldif tool resolves the objectClass
issue described in OPENDJ-3450.

File was deleted

			@@ -224,7 +224,7 @@

			<!-- Adds MakeLDIF configuration template resources -->
			<fileSet>
			<directory>${basedir}/resource/MakeLDIF</directory>
			<directory>${basedir}/../opendj-core/src/main/resources/org/forgerock/opendj/ldif</directory>
			<outputDirectory>template/config/MakeLDIF</outputDirectory>
			<includes>
			<include>*</include>

			@@ -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);

	opendj-server-legacy/resource/MakeLDIF/cities	232 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/resource/MakeLDIF/example.template	34 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/resource/MakeLDIF/first.names	8605 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/resource/MakeLDIF/last.names	13419 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/resource/MakeLDIF/states	51 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/resource/MakeLDIF/streets	74 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/src/main/assembly/opendj-archive-component.xml	2 ●●●●● patch \| view \| raw \| blame \| history
	opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java	5 ●●●●● patch \| view \| raw \| blame \| history