From f4d63953e2921caf92e7d38409f0b1861ea3d3e0 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Mon, 11 May 2015 16:54:30 +0000
Subject: [PATCH] Fix for OPENDJ-2015 Include deletion of entry cache preload configuration in upgrade process
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 8 +++++++-
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/tool.properties | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index d0c928a..999a67b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tools.upgrade;
@@ -394,6 +394,12 @@
deleteConfigEntry(INFO_UPGRADE_TASK_11476_SUMMARY.get(),
"dn: cn=File System,cn=Entry Caches,cn=config"));
+ /** See OPENDJ-1869 */
+ register("3.0.0.12226",
+ modifyConfigEntry(INFO_UPGRADE_TASK_12226_SUMMARY.get(),
+ "(objectclass=ds-cfg-root-config)",
+ "delete: ds-cfg-entry-cache-preload"));
+
/*
* All upgrades will refresh the server configuration schema and generate
* a new upgrade folder.
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/tool.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
index 89dfd9e..ea30659 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
@@ -2615,6 +2615,7 @@
Do you want to launch this process automatically at the end of the upgrade?
INFO_UPGRADE_TASK_11339_SUMMARY_10036=Removing config for 'Extensions'
INFO_UPGRADE_TASK_11476_SUMMARY_10037=Removing config for 'File System Entry Cache'
+INFO_UPGRADE_TASK_12226_SUMMARY_10038=Removing config for 'Entry Cache Preload'
# Strings for generated reference documentation.
REF_SHORT_DESC_BACKUP_15000=back up OpenDJ directory data
--
Gitblit v1.10.0