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_zh_CN.properties | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/opends/src/messages/messages/config_zh_CN.properties b/opends/src/messages/messages/config_zh_CN.properties index 90dccb4..dcb4310 100644 --- a/opends/src/messages/messages/config_zh_CN.properties +++ b/opends/src/messages/messages/config_zh_CN.properties @@ -21,6 +21,7 @@ # CDDL HEADER END # # Copyright 2006-2009 Sun Microsystems, Inc. +# Portions Copyright 2013 ForgeRock AS. @@ -235,7 +236,7 @@ SEVERE_WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX_187=\u914d\u7f6e\u6761\u76ee %s \u4e2d\u5b9a\u4e49\u7684\u5c5e\u6027\u8bed\u6cd5\u4e0e\u670d\u52a1\u5668\u914d\u7f6e\u4e2d\u5b9a\u4e49\u7684\u53e6\u4e00\u4e2a\u8bed\u6cd5\u51b2\u7a81: %s\u3002\u5c06\u4e0d\u4f1a\u4f7f\u7528\u6b64\u5c5e\u6027\u8bed\u6cd5 SEVERE_ERR_CONFIG_SCHEMA_NO_SCHEMA_DIR_188=\u65e0\u6cd5\u8bfb\u53d6\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u5b9a\u4e49\uff0c\u56e0\u4e3a\u6a21\u5f0f\u76ee\u5f55 %s \u4e0d\u5b58\u5728 SEVERE_ERR_CONFIG_SCHEMA_DIR_NOT_DIRECTORY_189=\u65e0\u6cd5\u8bfb\u53d6\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u5b9a\u4e49\uff0c\u56e0\u4e3a\u867d\u7136\u6a21\u5f0f\u76ee\u5f55 %s \u5b58\u5728\uff0c\u4f46\u662f\u5b83\u5e76\u4e0d\u662f\u76ee\u5f55 -SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=\u65e0\u6cd5\u4ece\u76ee\u5f55 %s \u6216 %s \u8bfb\u53d6\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u5b9a\u4e49\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u5217\u51fa\u8be5\u76ee\u5f55\u4e2d\u7684\u6587\u4ef6\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s +SEVERE_ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES_190=\u65e0\u6cd5\u4ece\u76ee\u5f55 %s \u8bfb\u53d6\u76ee\u5f55\u670d\u52a1\u5668\u6a21\u5f0f\u5b9a\u4e49\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u5217\u51fa\u8be5\u76ee\u5f55\u4e2d\u7684\u6587\u4ef6\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_OPEN_FILE_191=\u65e0\u6cd5\u89e3\u6790\u76ee\u5f55 %2$s \u4e2d\u7684\u6a21\u5f0f\u914d\u7f6e\u6587\u4ef6 %1$s\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u6253\u5f00\u7528\u4e8e\u8bfb\u53d6\u7684\u6587\u4ef6\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_READ_LDIF_ENTRY_192=\u65e0\u6cd5\u89e3\u6790\u76ee\u5f55 %2$s \u4e2d\u7684\u6a21\u5f0f\u914d\u7f6e\u6587\u4ef6 %1$s\uff0c\u56e0\u4e3a\u5c1d\u8bd5\u5c06\u5176\u5185\u5bb9\u4f5c\u4e3a LDIF \u6761\u76ee\u8bfb\u53d6\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %3$s SEVERE_WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE_193=\u65e0\u6cd5\u4ece\u6a21\u5f0f\u914d\u7f6e\u6587\u4ef6 %s \u89e3\u6790\u5c5e\u6027\u7c7b\u578b\u5b9a\u4e49: %s -- Gitblit v1.10.0