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/task.properties | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opends/src/messages/messages/task.properties b/opends/src/messages/messages/task.properties index 22570f1..f0dad69 100644 --- a/opends/src/messages/messages/task.properties +++ b/opends/src/messages/messages/task.properties @@ -21,7 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. -# Portions copyright 2012 ForgeRock AS. +# Portions copyright 2012-2013 ForgeRock AS. @@ -61,10 +61,10 @@ %s of task entry %s SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=Unable to add one or more files \ to the server schema because the specified schema file %s does not exist in \ - schema directories %s or %s + schema directory %s SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=Unable to add one or \ more files to the server schema because an error occurred while attempting to \ - determine whether file %s exists in schema directory %s or %s: %s + determine whether file %s exists in schema directory %s: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE_8=An error occurred \ while attempting to load the contents of schema file %s into the server \ schema: %s -- Gitblit v1.10.0