From dc69513f1be2b6e00c1e7418664513299dab8548 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 17 Jun 2016 08:42:29 +0000
Subject: [PATCH] OPENDJ-3081 restore ds-cfg-csv-delimiter-char in the concatenated schema during upgrade to OpenDJ 3.5
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
index 09f561a..22074c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -66,6 +66,7 @@
import static org.opends.server.tools.upgrade.FileManager.*;
import static org.opends.server.tools.upgrade.Installation.*;
import static org.opends.server.util.ChangeOperationType.*;
+import static org.opends.server.util.ServerConstants.*;
/** Common utility methods needed by the upgrade. */
final class UpgradeUtils
@@ -76,6 +77,8 @@
static final File configDirectory = new File(getInstancePath(), CONFIG_PATH_RELATIVE);
/** The {@code config/schema} folder of the current instance. */
static final File configSchemaDirectory = new File(configDirectory, SCHEMA_PATH_RELATIVE);
+ /** The {@code config/upgrade} folder of the current instance. */
+ static final File configUpgradeDirectory = new File(configDirectory, "upgrade");
/** The {@code template} folder of the current installation. */
private static final File templateDirectory = new File(getInstallationPath(), TEMPLATE_RELATIVE_PATH);
/** The {@code template/config} folder of the current installation. */
@@ -93,6 +96,8 @@
static final File batDirectory = new File(getInstallationPath(), WINDOWS_BINARIES_PATH_RELATIVE);
/** The server configuration file path. */
static final File configFile = new File(configDirectory, CURRENT_CONFIG_FILE_NAME);
+ /** The concatenated schema file of the current installation. */
+ static final File concatenatedSchemaFile = new File(configUpgradeDirectory, SCHEMA_CONCAT_FILE_NAME);
/**
* Returns the path of the installation of the directory server. Note that
--
Gitblit v1.10.0