From c9ad18d8f48e0f8603695ca1d5a83ed21cca9039 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 18 Dec 2014 14:48:39 +0000
Subject: [PATCH] OPENDJ-1701 Add upgrade task to remove "File System Entry Cache"
---
opendj3-server-dev/src/messages/messages/tools.properties | 13 +++++++------
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java | 17 +++++++++++------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/opendj3-server-dev/src/messages/messages/tools.properties b/opendj3-server-dev/src/messages/messages/tools.properties
index a4c3b6d..7f4f667 100644
--- a/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj3-server-dev/src/messages/messages/tools.properties
@@ -2583,10 +2583,10 @@
INFO_UPGRADE_TASK_10133_1_SUMMARY_10021=Changing matching rule for 'userCertificate' and \
'caCertificate' to CertificateExactMatch
INFO_UPGRADE_TASK_10133_2_SUMMARY_10022=Configuring 'CertificateExactMatch' matching rule
-INFO_UPGRADE_TASK_10214_1_SUMMARY_10023=Updating ds-cfg-java-class attribute in File-Based Debug Logger
-INFO_UPGRADE_TASK_10232_1_SUMMARY_10024=Deleting ds-cfg-default-debug-level attribute in File-Based Debug Logger
-INFO_UPGRADE_TASK_10329_1_SUMMARY_10025=Updating ds-cfg-default-severity attribute in File-Based Error Logger
-INFO_UPGRADE_TASK_10339_1_SUMMARY_10026=Updating ds-cfg-override-severity attribute in Replication Repair Logger
+INFO_UPGRADE_TASK_10214_SUMMARY_10023=Updating ds-cfg-java-class attribute in File-Based Debug Logger
+INFO_UPGRADE_TASK_10232_SUMMARY_10024=Deleting ds-cfg-default-debug-level attribute in File-Based Debug Logger
+INFO_UPGRADE_TASK_10329_SUMMARY_10025=Updating ds-cfg-default-severity attribute in File-Based Error Logger
+INFO_UPGRADE_TASK_10339_SUMMARY_10026=Updating ds-cfg-override-severity attribute in Replication Repair Logger
INFO_UPGRADE_TASK_10733_1_SUMMARY_10027=Removing 'dc=replicationchanges' backend
INFO_UPGRADE_TASK_10733_2_SUMMARY_10028=Removing ACI for 'dc=replicationchanges'
INFO_UPGRADE_TASK_10820_SUMMARY_10029=Adding default privilege 'changelog-read' to all root DNs
@@ -2594,8 +2594,9 @@
INFO_UPGRADE_TASK_11237_1_SUMMARY_10031=Removing config for 'Network Groups'
INFO_UPGRADE_TASK_11237_2_SUMMARY_10032=Removing config for 'Workflows'
INFO_UPGRADE_TASK_11237_3_SUMMARY_10033=Removing config for 'Workflow Elements'
-INFO_UPGRADE_TASK_11239_1_SUMMARY_10034=Removing config for 'Network Group Plugin'
+INFO_UPGRADE_TASK_11239_SUMMARY_10034=Removing config for 'Network Group Plugin'
INFO_UPGRADE_TASK_11260_SUMMARY_10035=OpenDJ 3.0.0 changed the matching rule implementations. \
All indexes have to be rebuilt. This could take a long time to proceed. \
Do you want to launch this process automatically at the end of the upgrade?
-INFO_UPGRADE_TASK_11339_1_SUMMARY_10036=Removing config for 'Extensions'
+INFO_UPGRADE_TASK_11339_SUMMARY_10036=Removing config for 'Extensions'
+INFO_UPGRADE_TASK_11476_SUMMARY_10037=Removing config for 'File System Entry Cache'
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 541bf93..d0c928a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -305,7 +305,7 @@
copySchemaFile("03-pwpolicyextension.ldif"));
register("3.0.0.10214",
- modifyConfigEntry(INFO_UPGRADE_TASK_10214_1_SUMMARY.get(),
+ modifyConfigEntry(INFO_UPGRADE_TASK_10214_SUMMARY.get(),
"(ds-cfg-java-class=org.opends.server.loggers.debug.TextDebugLogPublisher)",
"delete:ds-cfg-java-class",
"-",
@@ -313,12 +313,12 @@
"ds-cfg-java-class: org.opends.server.loggers.TextDebugLogPublisher"));
register("3.0.0.10232",
- modifyConfigEntry(INFO_UPGRADE_TASK_10232_1_SUMMARY.get(),
+ modifyConfigEntry(INFO_UPGRADE_TASK_10232_SUMMARY.get(),
"(objectclass=ds-cfg-file-based-debug-log-publisher)",
"delete:ds-cfg-default-debug-level"));
register("3.0.0.10329",
- modifyConfigEntry(INFO_UPGRADE_TASK_10329_1_SUMMARY.get(),
+ modifyConfigEntry(INFO_UPGRADE_TASK_10329_SUMMARY.get(),
"&(objectclass=ds-cfg-file-based-error-log-publisher)(cn=File-Based Error Logger)",
"delete:ds-cfg-default-severity",
"ds-cfg-default-severity: severe-warning",
@@ -331,7 +331,7 @@
));
register("3.0.0.10339",
- modifyConfigEntry(INFO_UPGRADE_TASK_10339_1_SUMMARY.get(),
+ modifyConfigEntry(INFO_UPGRADE_TASK_10339_SUMMARY.get(),
"&(objectclass=ds-cfg-file-based-error-log-publisher)(cn=Replication Repair Logger)",
"delete:ds-cfg-override-severity",
"-",
@@ -379,16 +379,21 @@
deleteConfigEntry(INFO_UPGRADE_TASK_11237_3_SUMMARY.get(),
"dn: cn=Workflow Elements,cn=config"));
register("3.0.0.11239",
- deleteConfigEntry(INFO_UPGRADE_TASK_11239_1_SUMMARY.get(),
+ deleteConfigEntry(INFO_UPGRADE_TASK_11239_SUMMARY.get(),
"dn: cn=Network Group,cn=Plugins,cn=config"));
register("3.0.0.11339",
- deleteConfigEntry(INFO_UPGRADE_TASK_11339_1_SUMMARY.get(),
+ deleteConfigEntry(INFO_UPGRADE_TASK_11339_SUMMARY.get(),
"dn: cn=Extensions,cn=config"));
/** See OPENDJ-1637 */
register("3.0.0.11260",
rebuildAllIndexes(INFO_UPGRADE_TASK_11260_SUMMARY.get()));
+ /** See OPENDJ-1701 */
+ register("3.0.0.11476",
+ deleteConfigEntry(INFO_UPGRADE_TASK_11476_SUMMARY.get(),
+ "dn: cn=File System,cn=Entry Caches,cn=config"));
+
/*
* All upgrades will refresh the server configuration schema and generate
* a new upgrade folder.
--
Gitblit v1.10.0