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_zh_CN.properties | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opends/src/messages/messages/task_zh_CN.properties b/opends/src/messages/messages/task_zh_CN.properties index a690e3a..0f7e4f6 100644 --- a/opends/src/messages/messages/task_zh_CN.properties +++ b/opends/src/messages/messages/task_zh_CN.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=\u4efb\u52a1 %s \u5df2\u542f\u52a8\u76ee\u5f55\u670d\u52a1\u5668\u5173\u95ed\u8fdb\u7a0b INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE_4=\u4efb\u52a1 %s \u5df2\u542f\u52a8\u76ee\u5f55\u670d\u52a1\u5668\u5173\u95ed\u8fdb\u7a0b: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_FILENAME_5=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u4efb\u52a1\u6761\u76ee %2$s \u7684\u5c5e\u6027 %1$s \u4e2d\u6ca1\u6709\u63d0\u4f9b\u4efb\u4f55\u6a21\u5f0f\u6587\u4ef6\u540d -SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u6a21\u5f0f\u76ee\u5f55 %2$s \u6216 %3$s \u4e2d\u4e0d\u5b58\u5728\u6307\u5b9a\u7684\u6a21\u5f0f\u6587\u4ef6 %1$s -SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u786e\u5b9a\u6a21\u5f0f\u76ee\u5f55 %2$s \u6216 %3$s \u4e2d\u662f\u5426\u5b58\u5728\u6587\u4ef6 %1$s \u65f6\u51fa\u73b0\u9519\u8bef: %4$s +SEVERE_ERR_TASK_ADDSCHEMAFILE_NO_SUCH_FILE_6=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u6a21\u5f0f\u76ee\u5f55 %2$s \u4e2d\u4e0d\u5b58\u5728\u6307\u5b9a\u7684\u6a21\u5f0f\u6587\u4ef6 %1$s +SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_CHECKING_FOR_FILE_7=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u786e\u5b9a\u6a21\u5f0f\u76ee\u5f55 %2$s \u4e2d\u662f\u5426\u5b58\u5728\u6587\u4ef6 %1$s \u65f6\u51fa\u73b0\u9519\u8bef: %4$s SEVERE_ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE_8=\u5c1d\u8bd5\u5c06\u6a21\u5f0f\u6587\u4ef6 %s \u7684\u5185\u5bb9\u88c5\u5165\u670d\u52a1\u5668\u6a21\u5f0f\u4e2d\u65f6\u51fa\u73b0\u9519\u8bef: %s SEVERE_ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA_9=\u65e0\u6cd5\u5c06\u4e00\u4e2a\u6216\u591a\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u670d\u52a1\u5668\u6a21\u5f0f\uff0c\u56e0\u4e3a\u670d\u52a1\u5668\u5728\u591a\u6b21\u5c1d\u8bd5\u540e\u65e0\u6cd5\u83b7\u5f97\u6a21\u5f0f\u6761\u76ee %s \u4e0a\u7684\u5199\u5165\u9501\u5b9a SEVERE_ERR_TASK_ADDSCHEMAFILE_INSUFFICIENT_PRIVILEGES_10=\u60a8\u6ca1\u6709\u8db3\u591f\u7684\u6743\u9650\u4fee\u6539\u670d\u52a1\u5668\u6a21\u5f0f -- Gitblit v1.10.0