From 6452a0b512de72a2beb6da4a3f50fdc788a0f90f Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 12 Jul 2007 14:41:36 +0000
Subject: [PATCH] This commit addresses issue 1851 "upgrader does not handle new config entries also present in current configuration". This issue is somewhat of a corner case but this code will allow a user to better deal with problems that might arise migrating the configuration or schema of a server.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 23444ca..9139fe0 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -1112,6 +1112,19 @@
to access its contents.
error-empty-response=ERROR: The response value may not be an empty string
+error-upgrade-migration=Migration Error
+error-upgrade-migration-schema=Schema Migration Error
+error-upgrade-migration-config=Configuration Migration Error
+error-upgrade-migration-add=An attempt to add entry <b>{0}</b> to the newly upgraded \
+ server was unsuccessful.
+error-upgrade-migration-delete=An attempt to delete entry <b>{0}</b> to the newly upgraded \
+ server was unsuccessful.
+error-upgrade-migration-modify=An attempt to modify entry <b>{0}</b> to the newly upgraded \
+ server was unsuccessful.
+error-upgrade-migration-unexpected=An unexpected error occured while processing entry \
+ <b>{0}</b>.
+error-upgrade-migration-note=You can cancel this upgrade altogether, continue anyway or retry this operation. If you cancel the server will be restored to the state it was in before the upgrade was attempted. If you continue you should be aware that the server may not configured as it was before this upgrade. A copy of the original installation files will be kept in <i>{0}</i>.
+
#
# Install Status: messages displayed in the offline quick setup
# if server is already installed.
--
Gitblit v1.10.0