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_ko.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/messages/messages/task_ko.properties b/opends/src/messages/messages/task_ko.properties index e47c370..4bad11f 100644 --- a/opends/src/messages/messages/task_ko.properties +++ b/opends/src/messages/messages/task_ko.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. +# Portions Copyright 2013 ForgeRock AS. @@ -52,8 +53,8 @@ INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE_3=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc885\ub8cc \ud504\ub85c\uc138\uc2a4\uac00 %s \uc791\uc5c5\uc73c\ub85c \uc2dc\uc791\ub418\uc5c8\uc2b5\ub2c8\ub2e4. INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE_4=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uc885\ub8cc \ud504\ub85c\uc138\uc2a4\uac00 %s \uc791\uc5c5\uc73c\ub85c \uc2dc\uc791\ub418\uc5c8\uc2b5\ub2c8\ub2e4: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_FILENAME_5=\uc791\uc5c5 \ud56d\ubaa9 %2$s\uc758 \uc18d\uc131 %1$s\uc5d0 \uc2a4\ud0a4\ub9c8 \ud30c\uc77c \uc774\ub984\uc744 \uc81c\uacf5\ud558\uc9c0 \uc54a\uc558\uae30 \ub54c\ubb38\uc5d0 \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \ud558\ub098 \uc774\uc0c1\uc758 \ud30c\uc77c\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. -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 -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 +SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=\uc9c0\uc815\ud55c \uc2a4\ud0a4\ub9c8 \ud30c\uc77c %s\uc774(\uac00) \uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc5d0 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \ud558\ub098 \uc774\uc0c1\uc758 \ud30c\uc77c\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=%s \ud30c\uc77c\uc774 \uc2a4\ud0a4\ub9c8 \ub514\ub809\ud1a0\ub9ac %s\uc5d0 \uc788\ub294\uc9c0 \ud655\uc778\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uae30 \ub54c\ubb38\uc5d0 \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \ud558\ub098 \uc774\uc0c1\uc758 \ud30c\uc77c\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE_8=\uc2a4\ud0a4\ub9c8 \ud30c\uc77c %s\uc758 \ub0b4\uc6a9\uc744 \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \ub85c\ub4dc\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA_9=\uc11c\ubc84\uac00 \uc5ec\ub7ec \ubc88 \uc2dc\ub3c4\ud588\uc9c0\ub9cc \uc2a4\ud0a4\ub9c8 \ud56d\ubaa9 %s\uc5d0 \ub300\ud55c \uc4f0\uae30 \uc7a0\uae08\uc744 \uac00\uc838\uc624\uc9c0 \ubabb\ud588\uae30 \ub54c\ubb38\uc5d0 \uc11c\ubc84 \uc2a4\ud0a4\ub9c8\uc5d0 \ud558\ub098 \uc774\uc0c1\uc758 \ud30c\uc77c\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. SEVERE_ERR_TASK_ADDSCHEMAFILE_INSUFFICIENT_PRIVILEGES_10=\uc11c\ubc84 \uc2a4\ud0a4\ub9c8\ub97c \uc218\uc815\ud560 \uc218 \uc788\ub294 \ucda9\ubd84\ud55c \uad8c\ud55c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4. -- Gitblit v1.10.0