From 0d97a7da226d93b8b87467efde523aa2120ceabc Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 07 Jun 2013 14:08:13 +0000
Subject: [PATCH] Fix for OPENDJ-925, OPENDJ-926, and overall schema management. Review CR-1806. Back a few years ago, when we did the SVR4 package, we split the schema into read-only (Install) and writable (Instance). With the template model in 2.6, the whole schema is under config, and we should never edit/change the one in the template. So, I've removed all code related to the 2 locations for schema, reverted some I10N messages to their previous versions, and tidy up code and tests. All unit-tests are passing. And it's also possible to change the instance.loc and run setup and have a fully functioning server :-)
---
opends/src/messages/messages/config.properties | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opends/src/messages/messages/config.properties b/opends/src/messages/messages/config.properties
index a536c76..c3e09a1 100644
--- a/opends/src/messages/messages/config.properties
+++ b/opends/src/messages/messages/config.properties
@@ -21,6 +21,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
+# Portions Copyright 2013 ForgeRock AS.
@@ -652,7 +653,7 @@
Server schema definitions because the schema directory %s exists but is not a \
directory
SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=Unable to read the Directory \
- Server schema definitions from directory %s or %s because an unexpected error \
+ Server schema definitions from directory %s because an unexpected error \
occurred while trying to list the files in that directory: %s
SEVERE_WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=Schema configuration file %s \
in directory %s cannot be parsed because an unexpected error occurred while \
@@ -2186,3 +2187,4 @@
MILD_WARN_CONFIG_LOGGING_UNSUPPORTED_FIELDS_IN_LOG_FORMAT_734=The log format \
for %s contains the folowing unsupported fields: %s. Their output will be \
replaced with a dash ("-") character
+NOTICE_DIRECTORY_CONFIGURATION_CHANGED_735=The server configuration has been changed
--
Gitblit v1.10.0